Merge remote-tracking branch '4-0-stable' into internal-public-projects

Conflicts:
	app/controllers/application_controller.rb
	app/models/ability.rb
	app/models/event.rb
	app/models/project.rb
	app/views/admin/projects/_form.html.haml
	app/views/dashboard/index.html.haml
Merge branch '4-0-stable' into internal-public-projects