merged activiti in core module
merged activiti in core module