Fixed id on settings page
Merge branch 'master' into gh-pages
Fixed merge conflict