merging
Conflicts:
	Gemfile.lock
	app/views/roles/_person_fields.html.haml
	config/locales/views.de.yml