Merge branch 'fix-interface' into 'master'

app/assets/javascripts/about.coffee

app/assets/stylesheets/about.scss

app/assets/stylesheets/application.scss

app/assets/stylesheets/application/welcome.scss

app/controllers/about_controller.rb

app/controllers/search_controller.rb

app/helpers/about_helper.rb

app/views/about/index.html.erb

app/views/layouts/application.html.erb

app/views/search/index.html.erb

app/views/shared/application/_collections.html.erb

app/views/shared/application/_contact.html.erb

app/views/shared/application/_faq.html.erb

app/views/shared/application/_footer_home.html.erb

app/views/shared/application/_header.html.erb

app/views/shared/application/_home.html.erb

app/views/welcome/index.html.erb

config/routes.rb