Test
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	View/layout.view.php