[AP]{coding} Encryption added
[AP]{coding} Encryption changed
Merge branch 'master' into MessageEncrypt

* master:
  [JE, MS] {coding} Sliding menu Button functionally implemented
  [JE, MS] {coding} Sliding menu Button Added, functionally missing
  [JE, MS] {testing} ChatActivity: Add Contact, Show Contacts
  [JE, MS] {testing} Sliding menu tests
  [JE, MS] {testing} Add contact, message send
  [MR,AP] {bugfix} merge with master complete
  [MR,AP] {bugfix} merge with master complete
  [MJ]{other} - Add user at message receive
  [MR,MJ]{test after code} - Delete user from list
  [MR,MJ]{test before code} - Delete user from list
[AP]{bugfix} Don't reinsert email into database after started conversation.
Merge branch 'master' of https://github.com/DusanTrkulja/sw14_xp_02

# By mjrohrer
# Via mjrohrer
* 'master' of https://github.com/DusanTrkulja/sw14_xp_02:
  [MJR] {testaftercode} addUnknownUserTest