AssignProjectsToUsersController.js
AssignUsersToProjectsController.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/model/Project.js
	app/store/Projects.js
	resources/data/projects.json