version 20131207 16:00 bylpp001
增加主页搜索框
Merge branch 'master' of https://github.com/scutLaoYi/shengwu

Conflicts:
	Controller/ProxyInfosController.php
version 20131207 16:15 bylpp001
完成主页搜索