Modified   app/controllers/KudosController.scala
Modified   app/json/JsonKudos.scala
Merge branch 'master' of https://github.com/tkaczmarzyk/kudos

Conflicts:
	app/json/JsonKudos.scala