Fix wait and waitFinish reload bug
Merge branch 'master' of https://github.com/mronlyalways/ziuq

Conflicts:
	src/main/java/at/ac/tuwien/big/we14/lab2/servlet/GameServlet.java