Merge branch 'master' of https://github.com/Activiti/Activiti
Oops, forgot something.
assignee and owner can be null at this point
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/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
fix ACT-1641: make sure only the path part of the url gets rewritten when generating diagram viewer url
#ACT-1426: Fixing behavior in nested multi-instance tasks.
New resources weren't secured yet
Added task query REST docs
Fixed copy-paste error - fixing tests
Merge pull request #60 from gtudan/ACT-1641

ACT-1641: make sure only the path part of the url gets rewritten
Merged pull request #57 (corrected typo, no automatic merge)
Adding test for deleteReason on processInstance id
ACT-1641 found a few more places where the the url gets rewritten in a way that might corrupt the host name
ACT-1578 corrected sort parameters of REST-API method /process-definitions
ACT-1671 documented /event REST-API
Merge pull request #61 from gtudan/ACT-1641

ACT-1641 - rewriting url might corrupt hostname
Merge pull request #63 from gtudan/ACT-1671

ACT-1671: documented "/event" REST-API
Merge pull request #62 from gtudan/ACT-1578

ACT-1578 corrected sort parameters of REST-API method /process-definitions