Merge branch 'master' into jl-next-homepage

Conflicts:
	app/controllers/projects_controller.rb
	app/locales/pages/projects/index.en.yml
	app/models/user.rb
	app/views/projects/index.html.slim