filters
Merge branch 'master' of https://github.com/exiao/TMKudos

Conflicts:
	kudos/kudosapp/templates/home.html