prettier ui
Merge branch 'master' of https://github.com/kgeorgieva/ggjCJK

Conflicts:
	src/com/cjk/thecloud/BattleActivity.java
a