merged teacher-interface branch with current master
Merge branch 'master' into teacher-interface
some bug fixes
Merge branch 'login' into teacher-interface
small fix on TI
updates to TI and Server. Unresolved bugs on serber regarding retriving cities and provinces
Game set-up functional but desired functionallity might still be missing.
Merge remote-tracking branch 'origin/teacher-interface'