Basic structure of contactable's messages
Contactable's tags merge
Contactable's tags merge fix
Contactables's tags merge fix
Merge fix
Merge branch 'master' of github.com:Exartu/Exartu-CRM

Conflicts:
	client/js/contactable.js