Merge branch feature/cho
Merge branch 'develop' into feature/shibuya

Conflicts:
	proj.ios/.DS_Store
	proj.ios/cocos2dx-space-game.xcodeproj/project.pbxproj