ACT-1477: userguide fix
Merge branch 'master' of https://github.com/Activiti/Activiti.git
SpringJobExecutor should reuse TaskExecutor after shutdown, lifecycle is
controlled by spring, thus won't be recreated on "start()" call.
Fixed intermittent failing test + added ProcessEngine lifecycle listener
+ altere JTA-oracle configuration
Fix for ACT-1528:  All variables are deleted after delete a history processinstance
Merge branch 'master' of github.com:Activiti/Activiti
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