first commit
Merge branch 'master' of https://github.com/guillaume-gouchon/angelpal

Conflicts:
	server/lib/errors.js
	server/lib/models/User.js
	server/lib/routes/organization.js