Merged master branch
create identifiers with manifestation
Merge branch 'issue6116tmp' of github.com:MiraitSystems/enju_trunk into issue6116tmp

Conflicts:
	app/controllers/manifestations_controller.rb
	config/locales/translation_en.yml
	config/locales/translation_ja.yml
	db/fixtures/system_configurations.yml