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

Conflicts:
	server/collections/contactable.js