Fix for variable include queries
Merge branch 'master' of https://github.com/Activiti/Activiti
Added task category support in REST (docs are still TODO)
Merge remote-tracking branch 'upstream/master'