深海を調整 じわじわたのしい
Merge branch 'hak' of https://github.com/giginet/VOXCHRONICLE into hak
Merge branch 'hak' into development

Conflicts:
	VOXCHRONICLE.xcodeproj/project.pbxproj
	VOXCHRONICLE/Resources/ios/Info.plist