created test for conference
Merge branch 'master' of https://github.com/brunnurs/zxm
Merge branch 'master' of https://github.com/brunnurs/zxm
still on test for conference
Merge branch 'master' of https://github.com/brunnurs/zxm
Merge branch 'master' of https://github.com/brunnurs/zxm
finished EncryptedMessageService test and removed other tests