cleaned code
Merge branch 'master' of https://github.com/franbienjan/NDSGthesis
fixed masterserver