messageerge branch 'master' into filling_in_layout

Conflicts:
app/helpers/application_helper.rb
app/views/layouts/application.html.erb
app/views/static_pages/home.html.erb
Filling_in_layout second merge