Modified javascript for google maps immutablemap in RideViewMap
Merge branch 'master' of github.com:destroyerdust/SWEN-343-Group6-CoolName
Fixed merge errors in location entities.