more checking in server
Merge branch 'master' of github.com:jonashalland/KTN2
Changed server