updating server
Merge branch 'master' of https://github.com/vinnare/and-loc
server source