Merge branch 'hotfix/0.4.1.1'
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
Merge branch 'develop' into social.mrzyx.de