Added some quick-launch metrics reporting screens and fixed some admin settings
Merge remote-tracking branch 'origin/develop' into develop