Makins sure transactionManager is initialized in right order
Merge branch 'master' of https://github.com/Activiti/Activiti.git
Fixed sub process multi instance and execution listener issue
Merge branch 'master' of https://github.com/Activiti/Activiti
Fix for ACT-1054
ACT-1518:  made the configuration of the workflowDefinitionConversionFactory easier by introducing defaults. Also fixed explorer bug when deploying a simple workflow
Merge branch 'master' of github.com:Activiti/Activiti
Added ID and KEY to simple workflow definition
merge with master