Merge branch 'master' into front-end-dev

Conflicts:
	.gitignore
Front End and Style Changes
Merge branch 'front-end-dev'

Conflicts:
	app/View/Quizzes/quiz.ctp
	app/View/Scoreboards/index.ctp
Fixed