asd
dsa
Merge branch 'master' of https://github.com/droid87/SecureChatManager

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
yeehaaaa
Merge branch 'master' of https://github.com/droid87/SecureChatManager
wifiP2pworks
added conversation and contact in oncreate for debugging