simple_form 3.0 migration
Merge ../x0y0

Conflicts:
	Gemfile
	Gemfile.lock
	app/helpers/application_helper.rb
	test/helpers/application_helper_test.rb