Merge branch 'master' into Discussion

Conflicts:
app/controllers/home_controller.rb
app/views/projects/show.html.erb