Merge branch 'webPages'

Conflicts:
	cp/admin/layout/css/custom.css