fixing map to allow null locations
Merge branch 'jhargrave' of https://github.com/itraycer/iTraycer into developer
Fixing merge problem with with commit 34c97cd, where my changes got overwritten
Transition Before & After improvements

Better managed callbacks for screen transitions.
Merge branch 'developer' into RSherman_LEX