battle stuff
Merge branch 'master' of https://github.com/kgeorgieva/ggjCJK

Conflicts:
	AndroidManifest.xml