part of memeber page design
调试分类信息添加和城市添加
Merge branch 'master' of https://github.com/ycaihappy/mu

Conflicts:
	code/webroot/protected/modules/admin/controllers/SiteController.php
	code/webroot/themes/classic/views/admin/site/manageCity.php
	code/webroot/themes/classic/views/admin/site/manageTerm.php
Merge branch 'master' of https://github.com/ycaihappy/mu