updating mock webserver

Conflicts:

	src/main/java/com/sciaps/MockWebserver.java