Fix for deployment on certain platforms (e.g. JBoss)
Merge branch 'master' of github.com:Activiti/Activiti