small changes to osgi module
Merge branch 'master' of https://github.com/Activiti/Activiti
Changes to activiti rest such it can produce an executable war
Merge branch 'master' of https://github.com/Activiti/Activiti
Merge remote-tracking branch 'upstream/master'