Merge remote-tracking branch 'origin/cwDev' into sdDev
Merge remote-tracking branch 'origin/LookandFeel2' into sdDev
Added blue header

rounded corners
still working on sidebar
test
merge commit
fix merge conflict - back up to date now.
gathered more changes from cwdev
same
adding grid to home page
Home grid phase 1
save
ds
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