Conflicts:
	app/assets/stylesheets/framework/blank.scss
	app/views/dashboard/projects/_zero_authorized_projects.html.haml
	spec/factories/licenses.rb