no message
Merge branch 'develop' of https://github.com/roripika/the_last_hair2dx into develop

Conflicts:
	the_last_hair2dx.xcodeproj/project.xcworkspace/xcuserdata/ooharayukio.xcuserdatad/UserInterfaceState.xcuserstate