敵とプレイヤーの画像表示
Merge branch 'develop' of https://github.com/fluncle/BarrelCannon into develop

Conflicts:
	proj.ios_mac/BarrelCannon.xcodeproj/project.pbxproj