Merge branch 'RSherman_LEX'

Conflicts:
index.html
js/mtsInventory.js
js/mtscollapsiblelistcarousel.js
HTML fix and temp fix in inventory
Merge branch 'master' of https://github.com/itraycer/iTraycer into jhargrave