Merge branch 'goobertron-rename_messages' into develop

Changelog.md

app/assets/javascripts/inbox.js

app/assets/stylesheets/bootstrap-headerfix.sass

app/assets/stylesheets/conversations.css.scss

app/assets/stylesheets/header.css.scss

app/assets/stylesheets/mobile.css.scss

app/assets/stylesheets/rtl.css.scss

app/assets/templates/header_tpl.jst.hbs

app/controllers/messages_controller.rb

app/views/conversations/index.haml

app/views/conversations/index.mobile.haml

app/views/conversations/new.haml

config/locales/diaspora/en.yml

config/locales/javascript/javascript.en.yml

features/desktop/conversations.feature

features/mobile/conversations.feature

features/step_definitions/conversations_steps.rb

spec/javascripts/app/views/header_view_spec.js