Signed-off-by: Ghostcandywyj <ghost.wyj@gmail.com>
Merge branch 'master' of https://github.com/meeting90/863_framework

Conflicts:
	WebRoot/WEB-INF/classes/workflow/parser/BPELLazyParser.class

Signed-off-by: Ghostcandywyj <ghost.wyj@gmail.com>

upload timelistener html
Merge branch 'master' of https://github.com/meeting90/863_framework

Conflicts:
	WebRoot/WEB-INF/classes/workflow/api/RelationServlet.class
	WebRoot/WEB-INF/classes/workflow/api/ServiceServlet.class
	WebRoot/WEB-INF/classes/workflow/api/WorkflowServlet.class
	WebRoot/WEB-INF/classes/workflow/parser/BPELLazyParser.class
	WebRoot/WEB-INF/classes/workflow/task/InitTask.class
	WebRoot/workflow/common.js
	WebRoot/workflow/service.html
	WebRoot/workflow/webservice.js
	WebRoot/workflow/workflow.html
	WebRoot/workflow/workflow.js
	src/workflow/api/ServiceServlet.java
	src/workflow/task/InitTask.java

Signed-off-by: Ghostcandywyj <ghost.wyj@gmail.com>
Signed-off-by: Ghostcandywyj <ghost.wyj@gmail.com>