Updated settings and reports page
Merge branch 'master' of github.com:cbar09/commonwealth-joe