last min stuff
Merge branch 'master' of
https://github.com/MoistyMoist/PetSociety-for-Android.git

Conflicts:
	petsociety/AndroidManifest.xml
	petsociety/res/values/strings.xml