removed requirejs
Merged 'dev'.

Conflicts:
	Gruntfile.js
	app/routes/contact/list/contact-list-ctrl.js
	app/routes/contact/request/list/contact-request-list-ctrl.js
	app/routes/conversation/conversation-ctrl.js
	app/routes/conversation/recipients/conversation-recipients-ctrl.js
	app/routes/conversation/security/conversation-security-ctrl.js
	app/routes/purl/purl-ctrl.js
	app/routes/purl/recipients/purl-recipients-ctrl.js
	app/routes/purl/security/purl-security-ctrl.js
	app/routes/settings/identity/edit/settings-identity-edit-ctrl.js
fixxed mutli identity
Finish remove-requirejs
unneeded