Quiz validation
Merge branch 'master' of https://github.com/arkona/content

Conflicts:
	app/views/Content/view/folder.php