Conflicts:
	app/assets/stylesheets/pages/boards.scss
    app/views/admin/groups/show.html.haml
    app/views/devise/shared/_tabs_ldap.html.haml
	app/views/notify/new_merge_request_email.html.haml
	app/views/projects/commits/_commit.html.haml
	app/views/projects/commits/show.html.haml
	app/views/projects/merge_requests/widget/_open.html.haml
	app/views/projects/project_members/index.html.haml
	config/routes/project.rb
	spec/features/notes_on_merge_requests_spec.rb
	spec/models/project_spec.rb