Merge branch 'master' of https://github.com/itraycer/iTraycer into jhargrave

Conflicts:
	js/mtsHandlePDF.js
making more like master
making more like master
Merge branch 'master' of https://github.com/itraycer/iTraycer into jhargrave
mostly location screen changes.
Map UI changes
Merge branch 'master' of https://github.com/itraycer/iTraycer into jhargrave
Merge branch 'master' of https://github.com/itraycer/iTraycer into jhargrave
fixing map.
making map automatically snap to point passed from inventory screen.
fix map
removing extra initinventory
Merge branch 'jhargrave' of https://github.com/itraycer/iTraycer into developer

Conflicts:
	js/mtsBillingConfirmation.js