adding previous changes again. Stupid branches.
Merge branch 'master' of https://github.com/TrevorMW/LRSGEN-rails
added geolocting to Hotel editing view for pinpoint accuracy
Merge pull request #6 from TrevorMW/edit-hotel-panel-updates

Edit hotel panel updates