Master merge 2

Repeat merge to test conflicts
Updated meters to pixels

Fixed meters to pixels for cordon radius.
Need to increase pixel map size to accommodate larger radius.