Merge branch 'hotfix/0.4.1.1'
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 remote-tracking branch 'upstream/develop' into pod.jpope.org