Cleaning up.
Merge branch 'master' of https://github.com/haches/e4mooc

Conflicts:
	src/ch/ethz/e4mooc/server/util/ServerState.java