fixing map to allow null locations
Merge branch 'jhargrave' of https://github.com/itraycer/iTraycer into developer