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

Conflicts:
	app/View/Quizzes/quiz.ctp
COmmit
FU COMMIT THIS
Merge branch 'front-end-dev'