some bloody software that just causes problems
Merge branch 'development' into bug_fixes

Conflicts:
	Gemfile
Merge branch 'bug_fixes' into development
Merge branch 'bug_fixes' of git+ssh://github.com/Det-Kongelige-Bibliotek/hel into bug_fixes
Merge branch 'development' into bug_fixes