Merge branch 'master' into diverging-branch-graphs

.flayignore

.gitignore

.gitlab-ci.yml

CHANGELOG

Gemfile

Gemfile.lock

PROCESS.md

app/assets/images/auth_buttons/facebook_64.png

app/assets/javascripts/calendar.js.coffee

app/assets/javascripts/dispatcher.js.coffee

app/assets/stylesheets/framework/blocks.scss

app/assets/stylesheets/framework/buttons.scss

app/assets/stylesheets/framework/callout.scss

app/assets/stylesheets/framework/common.scss

app/assets/stylesheets/framework/layout.scss

app/assets/stylesheets/framework/lists.scss

app/assets/stylesheets/framework/markdown_area.scss

app/assets/stylesheets/framework/mixins.scss

app/assets/stylesheets/framework/sidebar.scss

app/assets/stylesheets/framework/typography.scss