icon image 적용, ComboLayer.java modified
Merge branch 'master' of https://github.com/tae1560/battler_dog

Conflicts:
	src/contest/lab/gala/BattleLayer.java
	src/contest/lab/gala/ComboLayer.java
	src/contest/lab/gala/GameLayer.java
	src/contest/lab/gala/MainAnimationLayer.java
	src/contest/lab/gala/ReadyToFightLayer.java
	src/contest/lab/gala/ResultLayer.java