Merge branch 'driley' into RSherman_LEX

Conflicts:
config.xml
index.html