Merging
Merge branch 'master' of github.com:Exartu/Exartu-CRM

Conflicts:
	server/collections/hierarchy.js
	server/collections/user.js
	server/lib/collections.js
	server/main.js