changed front page words
Merge branch 'dev'