routine
Merge origin/master

Conflicts:
	app/components/cai-user-contacts.html
	app/scripts/controllers/MainCtrl.js
	app/scripts/controllers/ProfileCtrl.js
Merge origin/master

Conflicts:
	app/components/cai-user-contacts.html
	app/scripts/controllers/MainCtrl.js
	app/scripts/controllers/ProfileCtrl.js