Changed version number
Merge branch 'master' of https://github.com/aghadiry/AndroidHelloWorld

Conflicts:
	AndroidManifest.xml