Updates
Merge branch 'master' into front-end-dev
Commit
Commit
Merge branch 'front-end-dev'

Conflicts:
	app/View/Quizzes/quiz.ctp
	app/View/Scoreboards/index.ctp
Try to ignoe git ignore file