BattleLayer.java 애니매이션 작업중
Merge branch 'master' of https://github.com/tae1560/battler_dog
Merge branch 'master' of https://github.com/tae1560/battler_dog
애니매이션 하는중
Merge branch 'master' of https://github.com/tae1560/battler_dog

Conflicts:
	src/contest/lab/gala/JoinActivity.java
	src/contest/lab/gala/data/User.java
normal animation까지.
SkillGageLayer.java, BattleLayer.java 합치기 전 버전