fixed 404
Merge branch 'dev'
Update index.html
Merge branch 'master' into feature_services-app-page