Minor changes
Merge remote-tracking branch 'origin/master'

Conflicts:

	src/main/java/de/mpg/mpdl/htmlScreenshotService/service/HtmlScreenshotServlet.java