various edits
Merge branch 'develop' into staging
Edited index.html for order
Merge branch 'develop' into staging