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

Conflicts:
	css/mainCustom.css
	protected/modules/training/views/training/index.php
	protected/modules/training/views/training/view.php
	protected/runtime/cache-1.1.12.db
Merge branch 'cwDev' of https://github.com/cwilloughby/CI20 into cwDev

Conflicts:
	css/mainCustom.css
	protected/modules/training/views/training/index.php
	protected/modules/training/views/training/view.php
	protected/runtime/cache-1.1.12.db