Merge branch 'master' into badams
adding filter labels and counts
add badging templates
fixed badging bug
adding opt in controllers

also putting labels into global properties file
Merge branch 'badams'

Conflicts:
	controllers/controllersReviewPreview.js
	controllers/controllersReviewsSubmission.js
	models/varsTemplates.js
fixing conflict in vartemplates.js
fixing conflicts in controllersReviewPreview.js
fixing conflicts in controllersReviewSubmission.js