Merge branch 'master' of https://github.com/Activiti/Activiti

Conflicts:
	modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/TaskEntity.java
Merge branch 'master' of https://github.com/marcusk24/Activiti