made some bugfixes for sorting by nearby city and setlocationhandler that were introduced in last few commits
Merge https://github.com/CMPUT-301F14T10/project