ini
Merge remote-tracking branch 're/master'

Conflicts:
	ServiceSystem/DB/servicesystem.pdm
	ServiceSystem/WebRoot/common/page.vm
	ServiceSystem/WebRoot/remind/buweiFullEdit.vm
	ServiceSystem/WebRoot/remind/buweiFullManage.vm
	ServiceSystem/WebRoot/remind/yaomingFullManage.vm
	ServiceSystem/src/hibernate.cfg.xml
	ServiceSystem/src/service/actions/remind/BuweiAction.java
	ServiceSystem/src/service/actions/remind/struts_buwei.xml
	ServiceSystem/src/service/services/remind/impl/BuweiServiceImpl.java
	ServiceSystem/src/service/test/remind/spring/BuweiSpringTest.java
	ServiceSystem/src/service/util/Page.java
	ServiceSystem/src/system.properties