refs 6175 master marged

Conflicts:
	app/views/page/configuration.html.erb
	config/locales/translation_en.yml
	config/locales/translation_ja.yml