Minor changes.
Merge branch 'master' of github.com:fabianschuiki/quantum-poc

Conflicts:
	source/Server.php