Desktop Sync

Trying to sync desktop
Merge branch 'master' of https://github.com/krzasteka/EncryptedSMS

Conflicts:
AndroidManifest.xml
androidmanifest conflict

trying to resolve conflict