layout
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	application/layouts/scripts/layout.phtml