Remove dev paths
Enable the edit component to have labels for predefined edit values, instead of the value itself as a label
Merge branch 'master' into deploy/webkaart-test

Conflicts:
	viewer-admin/src/main/webapp/WEB-INF/web.xml
	viewer/src/main/webapp/WEB-INF/web.xml