Controller: redirect layout or layout_public
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	application/controllers/ContentController.php