Merge branch 'hotfix/0.4.1.1'
Added classes to the body for easier page specific styling.
Clarify explanation of account deleteion process
Merge pull request #5359 from goobertron/ac_close_text

Ka-BOOM! Fixes #5358
LibreJS should work with most of the site
Merge pull request #5320 from zikalify/librejs_headers

Librejs headers
Added more LibreJS support
change x11 to expat license
Merge pull request #5365 from zikalify/librejs_headers

Librejs headers
let default sidekiq config actually process the maintenance queue
Replaced jquery.hotkeys.js vendored asset with a bower package #5194
Merge pull request #5368 from strivedi183/5194-replace-jqueryhotkysjs-vendored-asset-with-bower-package

Replaced jquery.hotkeys.js vendored asset with a bower package #5194
bump Rails to fix CVE-2014-7818
Merge branch 'hotfix/0.4.1.2' into develop

Conflicts:
	Changelog.md
	Gemfile
	Gemfile.lock
	config/defaults.yml
Ask for confirmation when leaving a submittable publisher
Merge pull request #5309 from svbergerem/confirm-unload-publisher

Ask for confirmation when leaving a submittable publisher
Merge branch 'body-classes' of https://github.com/roymckenzie/diaspora into roymckenzie-body-classes
Merge branch 'roymckenzie-body-classes' into develop