update
Merge branch 'master' of https://github.com/zywonderful2/daidai800

Conflicts:
	Daidai800/WebContent/WEB-INF/applicationContext.xml
	Daidai800/src/com/timer/ScheduleJobs.java
add