Conflicts:
	app/views/ci/variables/_variable_row.html.haml
	app/views/import/github/new.html.haml
	app/views/projects/new.html.haml
	app/views/shared/_import_form.html.haml
	spec/javascripts/fixtures/projects.rb