Merge branch 'master' into badams
Merge pull request #7 from brianadamsdesigns/bbalentine

added template for thank you page
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
Merge branch 'master' into badams
Initial display styling
updating Preview and Thank You controllers to be separated

also adding preview and thank you to comments
feedback from Des

* reverse overall rating order
* remove CDV container if empty
separating badges between user and content
adding loading animation wrappers
Merge branch 'badams'
CSS Updates

Better button styles; inappropriate submission styling
Merge branch 'master' into BestBuyImplementation

Conflicts:
	controllers/controllersBadges.js
	controllers/controllersReviews.js
	index.html
	models/varsGlobal.js
	views/reviews/display/reviewContainer.html
Created badge text templates