xxx
Merge branch 'master' of github.com:raineelee/27s_b

Conflicts:
	protected/views/modules/setting/site.tpl.php
recipe
recipe