Set hierId properly on user creation
User invitation refactor
Merge branch 'devel' of psoto:Exartu/Exartu-CRM into devel

Conflicts:
	client/views/users/list/users.html
	client/views/users/list/users.js