Implemented timer for challenges
Merge branch 'master' of https://github.com/OpenClassKnowledgeBase/OCKB

Conflicts:
	app/controllers/Application.java