[기타] merge 로 인한 이미지 추가
Merge branch 'master' into develop

Conflicts:
	stAniPang/bin-debug/res/img_hd/panel/background.png
	stAniPang/bin-debug/res/img_sd/panel/background.png
	stAniPang/bin-debug/res/img_sd/worldmaps/worldmap_4.png
	stAniPang/bin-debug/res/img_sd/worldmaps/worldmap_4.xml
	stAniPang/bin-debug/res/img_sd/worldmaps/worldmap_5.png
	stAniPang/bin-debug/res/img_sd/worldmaps/worldmap_5.xml
	stAniPang/bin-debug/res/img_sd/worldmaps/worldmap_6.png
	stAniPang/bin-debug/res/img_sd/worldmaps/worldmap_6.xml
	stAniPang/bin-debug/res/img_sd/worldmaps/worldmap_7.png
	stAniPang/bin-debug/res/img_sd/worldmaps/worldmap_7.xml
	stAniPang/bin-debug/stAniPang.swf