add encryption check function
fix syntax
rm loop
add new filetype .3ggp
set requirejs timout to 0 for android 4.3 error
update new icons page with filetypes
update saftyLevel Handling
Merge branch 'origin/feature-attachments'
Merged 'dev'.

Conflicts:
	app/comps/conversations/drtv-conversation.js
	app/comps/conversations/srvc-conversationModel.js
update saftyLevel and Passphrase Handling
iOS und WindowsPhone removed
fixxed cockpit
fix conversation controls, pw handling gedönz!
Merged 'dev'.
Finish attachments
bugfixes
zwischenstand
tests laufen yay \o/
keylists wird aktualisert wenn eine nachrict gesendet oder ein neuer empfänger hinzugefügt wird.
Tests gefixt
commit file-chooser phonegap-plugin
Merge branch 'origin/feature-attachments'
Merged 'dev'.