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

Conflicts:
	Daidai800/src/com/renrendai/RenrendaiWriterProcessor.java
	Daidai800/src/com/timer/ScheduleJobs.java