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

Conflicts:
	client/style/css/custom.css
	client/views/header/header.html