JOB_CANCELED
PROCESS_COMPLETED event
TASK_TIMEOUT
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
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