临时版本，合并最新版 GentleH 2013/12/26
Merge branch 'master' of https://github.com/scutLaoYi/shengwu into CSSbranch

Conflicts:
	View/Elements/proxy_list.ctp
	View/Layouts/default.ctp
	webroot/css/mainPage.css
merge version 标记：出现两次content