Merge branch 'refs/heads/master' into csv_import

Conflicts:
	app/models/actor.rb
	app/views/actor/_new_actor_information_types.html.erb
	app/views/layouts/application.html.erb
	config/locales/en.yml
Merge branch 'csv_import' of github.com:pse3/SGfM into csv_import

Conflicts:
	app/views/layouts/application.html.erb
fixed merge fail