removed requirejs
new dirs for user/identity
started upload-avatar
prepared avatar update
try iphone jsencrypt delay
Merged 'dev'.

Conflicts:
	app/comps/conversations/drtv-conversation.js
not usefull to use new/old lib
solved identities and avatar upload
Merged 'dev'.
solved upload avatar
add link to android versions
solved upload avatar
update security aspects
the process starts now, when aspects are shown
talks should be load faster
rm console.log
rm scrollto Image in messages
removed debug true
Finish upload-avatar
update security aspects
solved update avatar
Merge remote-tracking branch 'origin/dev' into dev
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