Update userController.js
Bloody ember data
re-enable project and investigation creation
pull the org and product out of the put request
Merge branch 'master' into add-orgs

Conflicts:
	modules/userController.js