第一次提交
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
	src/main/java/com/dgg/affairs/business/anno/domain/impl/AnnouncementDmnImpl.java
	src/main/java/com/dgg/affairs/business/bpm/controller/BPMController.java
	src/main/java/com/dgg/affairs/business/bpm/entity/BPMEntity.java
	src/main/java/com/dgg/affairs/business/focus/entity/Focus.java
	src/main/resources/global.properties
	src/main/resources/jdbc.properties
	src/main/resources/spring/dao.xml
	src/main/webapp/WEB-INF/bpm/anno/add.html
	src/main/webapp/WEB-INF/bpm/anno/modify.html
	src/main/webapp/WEB-INF/bpm/buttons_add.html
	src/main/webapp/WEB-INF/bpm/buttons_modify.html
	src/main/webapp/WEB-INF/bpm/focus/add.html
	src/main/webapp/WEB-INF/bpm/focus/modify.html
	src/main/webapp/WEB-INF/bpm/link.html
	src/main/webapp/WEB-INF/bpm/official_preview.html
	src/main/webapp/WEB-INF/header.html
	src/main/webapp/WEB-INF/link/admin.html
	src/main/webapp/resources/default/css/bpm.css
	src/main/webapp/resources/js/bpm/bpm.js
	src/main/webapp/resources/js/lib/ajaxfileupload.js
	src/main/webapp/resources/js/lib/jquery-extends.js
	src/main/webapp/resources/js/lib/util.js