JOB_CANCELED
PROCESS_COMPLETED event
TASK_TIMEOUT
Database event log: fix for failing postgres test
Applied patch ACT-2057
Merge branch 'master' of https://github.com/Activiti/Activiti
Several semantic fixes
Fix for ACT-2056
Fix for failing QA test on oracle (tenantId handling)
Merge branch 'master' of https://github.com/Activiti/Activiti

# By Tijs Rademakers
# Via Tijs Rademakers
* 'master' of https://github.com/Activiti/Activiti:
  Fix for ACT-2056
  Several semantic fixes
  Applied patch ACT-2057
Some more event handlers for event logging + basic tests
Merge branch 'pull-PROCESS_COMPLETED' of https://github.com/martin-grofcik/Activiti into martin-grofcik-pull-PROCESS_COMPLETED
Merge branch 'pull-JOB_CANCELED' of https://github.com/martin-grofcik/Activiti into martin-grofcik-pull-JOB_CANCELED
Changed job executor notification logic
Fix faulty transaction requires new change
Merge branch 'pull-TASK_TIMEOUT' of https://github.com/martin-grofcik/Activiti into martin-grofcik-pull-TASK_TIMEOUT
JOB_CANCELED
PROCESS_COMPLETED event
Merge branch 'martin-grofcik-pull-TASK_TIMEOUT'

* martin-grofcik-pull-TASK_TIMEOUT:
  TASK_TIMEOUT
  PROCESS_COMPLETED event
  JOB_CANCELED

Conflicts:
	modules/activiti-engine/src/main/java/org/activiti/engine/delegate/event/ActivitiEventType.java
	modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CancelJobCmd.java
crystalball- replay event log implementation