Modified the android xml
Modifeid resurce again
Merge branch 'master' of
https://github.com/srizzling/NatureQuestClient.git

Conflicts:
	AndroidManifest.xml
I hate eclipse