# By Tijs Rademakers
# Via Tijs Rademakers
* 'activiti6' of https://github.com/Activiti/Activiti:
  Refactoring for Activiti 5 compatibility + Spring, CXF and Camel unit testing

# By Tijs Rademakers
# Via Tijs Rademakers
* 'activiti6' of https://github.com/Activiti/Activiti:
  Spring compatibility testing for Activiti 5 engine
  Compatibility test fixes
  Move to unified interfaces for DelegateExecution, ExecutionListener etc

Pulling PersistentObjectCache out of DbSqlSession, bringing it to the same level (a Session implementation).
Next stop is making the EntityManagers engine static (now they are session instantiated) and extracting an interface for the DbSqlSession.

# By Tijs Rademakers
# Via Tijs Rademakers
* 'activiti6' of https://github.com/Activiti/Activiti:
  Update migration.adoc

# By Tijs Rademakers
# Via Tijs Rademakers
* 'activiti6' of https://github.com/Activiti/Activiti:
  Changes for Activiti 6 release build
  Activiti 6 angular UI

Conflicts:
	modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntityManager.java

Delete byte array only if there is one

Conflicts:
	modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AddIdentityLinkForProcessInstanceCmd.java
	modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CancelJobCmd.java
	modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteJobCmd.java
	modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/DeploymentEntityManager.java
	modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricTaskInstanceEntityManager.java
	modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/TaskEntityManager.java