Merge branch 'RSherman_LEX'

Conflicts:
index.html
js/mtsInventory.js
js/mtscollapsiblelistcarousel.js