Fixed bugs
Merge branch 'master' into camel

Conflicts:
	etc/plugins.json
Added routebuilder to whelk config for prod