Merged
Merged
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/openceres/core/scheduler/QuartzScheduler.java
	src/main/java/com/openceres/dao/InFactory.java
	src/main/java/com/openceres/dao/OutFactory.java