backbutton
Merge branch 'master' of https://github.com/tae1560/battler_dog

Conflicts:
	src/contest/lab/gala/BattlerDogActivity.java