Merge branch 'master' into erich_dev
Fixing index page text
Merge branch 'erich_dev'