Merge w/ Master
Merge branch 'master' into front-end-dev

Conflicts:
	.gitignore
Merge branch 'front-end-dev' with css changes, changes in views: layout, quizzes and splash

Conflicts:
	.gitignore
	app/webroot/css/smst.css