Conflicts:
	app/views/dashboard/projects.html.haml
	app/views/layouts/_head_panel.html.haml
	config/routes.rb