マイページのプロフィール作成ページまで作成　テスト前
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	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
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_ja