Fixed geolocation sort.
Updated UML with last class
Reverted elastic search type back to main one.
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project
Javadocs compiled.
Javadocs compiled.