Merge branch 'master' into design_merge
Fix stupid tagging error
Merge branch 'design_merge'

Conflicts:
	app/static/js/kudos.js