This commits all the changes pulled from the remote repo
This updates the version number for the AndroidManifest.xml

Merge branch 'dev' of https://github.com/v6/Btc2Sms into dev

Conflicts:
	mobile/btc2sms/AndroidManifest.xml