commented out progress bar
Merge branch 'master' of https://github.com/walterlatimer/goodmeasure
updated admin/cohorts/show back button
git pulled dashboard and fixed conflicts