Merge branch 'master' of https://github.com/marcusk24/Activiti into marcusk24-master
Fixes for ACT-1585: Linking process instances and users
Merge branch 'master' of github.com:Activiti/Activiti
Merge Ryans work in Camel module
Merge branch 'master' of https://github.com/Activiti/Activiti
Patch for missing definitions
Upgrading Junit and H2 to latest version. Adding UTF-8 support to pom.xml
ACT-1585: replacing getPersistentState() of IdentityLinkEntity with something that actually works
Act-1591: temporary test fix for issue on os x
Merge branch 'master' of github.com:Activiti/Activiti
Fix for failing CDI test
Added reporting artwork for explorer
ACT-1593: basics for simple reporting capabilities
Deprecating MAX and MIN values for priority on Task, moved to explorer
i18n zh-CN for explorer 5.12
ACT-1593: cont. basics for simple reporting capabilities
Merge branch 'master' of github.com:Activiti/Activiti
ACT-1593: cont. basics for simple reporting capabilities
Merge pull request #43 from henryyan/master

i18n zh-CN for explorer 5.12
ACT-995 fix