Added location categories to map.
Resolved merge conflicts.