Merge branch 'master' into reply-by-email-docs

CHANGELOG

Gemfile

Gemfile.lock

app/assets/fonts/OFL.txt

app/assets/fonts/SourceSansPro-Black.ttf

app/assets/fonts/SourceSansPro-BlackItalic.ttf

app/assets/fonts/SourceSansPro-Bold.ttf

app/assets/fonts/SourceSansPro-BoldItalic.ttf

app/assets/fonts/SourceSansPro-ExtraLight.ttf

app/assets/fonts/SourceSansPro-ExtraLightItalic.ttf

app/assets/fonts/SourceSansPro-Italic.ttf

app/assets/fonts/SourceSansPro-Light.ttf

app/assets/fonts/SourceSansPro-LightItalic.ttf

app/assets/fonts/SourceSansPro-Regular.ttf

app/assets/fonts/SourceSansPro-Semibold.ttf

app/assets/fonts/SourceSansPro-SemiboldItalic.ttf

app/assets/javascripts/activities.js.coffee

app/assets/javascripts/application.js.coffee

app/assets/javascripts/dispatcher.js.coffee

app/assets/javascripts/notes.js.coffee