rename modal close button
fix double loading after registration
Merge remote-tracking branch 'origin/feature-conversation-controls' into feature-conversation-controls
update
Merge remote-tracking branch 'origin/feature-conversation-controls' into feature-conversation-controls

Conflicts:
	app/comps/contacts/srvc-contacts-model.js
	app/comps/ui/drtv-modal-alert.html