initial commit
save
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/controllers/SiteController.php
	themes/cdecor/views/site/customization.php
	themes/cdecor/views/site/header.php
	themes/cdecor/views/site/inspiration.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/controllers/SiteController.php
	themes/cdecor/views/site/customization.php
	themes/cdecor/views/site/header.php
	themes/cdecor/views/site/inspiration.php