Merged and squashed rails4 on top of next

Conflicts:
	db/empty_medienarchiv_instance_with_personas.pgsql.gz