Added location data for maps
Merge branch 'dev' of github.com:simbiotica/iom into developer/davidsingal
resolve pivotal issues