Merge pull request #289 from cchan5/master

Added a GeoLocation model and controller
updateing
Yo
Added more functionality for geolocation
Added more geo location functions
Merge pull request #296 from pachalad/elasticSearchDev

Elastic search dev