no message
Merge branch 'develop' of https://github.com/MikaE/Region into develop
メッセージ送信返信可能
no message
プル禁止
Merge branch 'develop' of https://github.com/MikaE/Region into develop

Conflicts:
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_ja
	app/tmp/cache/persistent/myapp_cake_core_cake_ja
	app/tmp/cache/persistent/myapp_cake_core_debug_kit_ja
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/logs/error.log