commit
Merge remote-tracking branch 'origin/NewHomeGridView' into cwDev

Conflicts:
	protected/views/layouts/column1.php