Conflicts:
	app/assets/javascripts/project_new.js
	app/views/projects/_merge_request_settings.html.haml
	spec/javascripts/datetime_utility_spec.js.coffee