progress bars are here!
Merge branch 'master' of https://github.com/atamborrino/ZenFeedback

Conflicts:
	app/controllers/Application.scala
	conf/routes