Added the clause function
Merge branch 'master' of https://github.com/socd-io/Show-2014-Website

Conflicts:
	app/setup.php