マージのため一時コミット
Merge branch 'master' of https://github.com/maplesystems/KeepMyShapeWeb

Conflicts:
	app/Locale/jpn/LC_MESSAGES/default.po