Changed location of geocalc package. Fixed serverController (now using User class)