update config
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/de/mpg/mpdl/service/rest/dataviewer/ServiceConfiguration.java
	src/main/java/de/mpg/mpdl/service/rest/dataviewer/process/RestProcessUtils.java