Fix DeployInvalidXmlTest
Added additional inclusive gateway test
Merge branch 'master' of https://github.com/Activiti/Activiti