# Conflicts: # website/server/controllers/api-v3/user.js
* Reorganized spell code * Added quantity field * Fixed parameter passing