Add <task:annotation-driven /> annotation to DemoSite
Merge remote-tracking branch 'origin/develop' into workflow_support