struts.xml ---增加了基础设置中的所需的action配置
package  --basicSettings  基础设置中的一些模块。
Merge branch 'master' of https://github.com/xuchaobei/SCFRM.git

Conflicts:
	WebContent/META-INF/context.xml
	WebContent/js/lib/jquery-1.10.1.min.js
	src/cn/gov/scciq/bussiness/example/HelloJsonAction.java
	src/struts.xml
Merge branch 'master' of https://github.com/xuchaobei/SCFRM.git

Conflicts:
	WebContent/html/ConventionCtrl.html
	WebContent/index.html
	WebContent/js/ConventionCtrl.js
	WebContent/js/index.js
	WebContent/js/lib/custom.js
	WebContent/login.html
	src/cn/gov/scciq/bussiness/searchSelect/SearchSelectAction.java
Merge branch 'master' of https://github.com/xuchaobei/SCFRM.git
basicsetting 11-25
1128样式的修改
Merge branch 'master' of https://github.com/xuchaobei/SCFRM.git

Conflicts:
	WebContent/html/ConventionCtrl.html
	WebContent/index.html
	WebContent/js/ConventionCtrl.js
	WebContent/js/index.js
	WebContent/js/lib/custom.js
	src/cn/gov/scciq/bussiness/riskCtrl/ConventionCtrlAction.java