Ändrat Android manifesto inför merge
uppdaterat android manifesto inför merge
Merge branch 'master' of https://github.com/Fump/GameOfNature.git

Conflicts:
	GameOfNature/AndroidManifest.xml
	GameOfNature/bin/AndroidManifest.xml