Merge branch 'driley' into RSherman_LEX

Conflicts:
index.html
js/mtscollapsiblelistcarousel.js