Fix some warnings.
Merge branch 'feature-bonus-v2' into develop
Merge branch 'develop' of https://github.com/balloonsys/UMO into develop

Conflicts:
	UMO.xcodeproj/project.pbxproj