delete file from resources (fix act-1839)
Enabled injection of mail templates from vars as well as fields
ACT-1904: introduce ProcessEngineConfigurator
Merge branch 'master' of github.com:Activiti/Activiti
Merge pull request #200 from martin-grofcik/eventInfrastructure

delete file from resources (fix act-1839)
ACT-1907Add ProcessInstanceHistoryLog convenience
Merge branches 'master' and 'master' of https://github.com/Activiti/Activiti
Switched position of classes in isAssignableFrom()
Merge branch 'spring3' of https://github.com/joshlong/Activiti into joshlong-spring3
Reformatting + fixing failing tests
Merge branch 'master' of https://github.com/Activiti/Activiti
ACT-1910: @EnableActiviti documentation + simple test
Fixing failing QA, whilst introducing a ‘CleanupTestExecutionListener’ for Spring + Junit
Downgrade to Spring 3.2.7 due to Mule Spring 4.x issue
Implementation of tenancy for start process with key
Merge branch 'master' of https://github.com/Activiti/Activiti
Use Context.getProcessEngineConfiguration 

in preference to casting execution.getEngineServices().
Fixing QA and database quirks when handling null values in unique constraint in the context of multi tenancy.
Fix multi tenancy on Oracle: oracle treats empty strings as null. Build workaround in queries in.
Fix for failing tests on oracle (multi tenancy)