reshufflin'
Merge branch 'development' of https://github.com/codin/scaffold into development

Conflicts:
	scaffold/routes/router.php
	scaffold/routes/routes.php
	scaffold/scaffold.php