Changed location of geocalc package. Fixed serverController (now using User class)
Merge pull request #6 from l-e-x-x/master

Merge it (fixed some problems)