ACT-1571: Improvements to layout algorithm + added 'addBpmnModel' to DeploymentBuilder
Merge branch 'master' of github.com:Activiti/Activiti