Added some fields to map content type for google map.
Resolved merge conflicts.