Required parameters for creating a new user
Merge branch 'master' of github.com:rhannequin/qsapi

Conflicts:
	controllers/errors.js
	controllers/user.js