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
Added 'new' deployment-related REST-resources and tests
Added tests for legacy REST-calls related to "Deployment" resource
Added new deployment-resources REST
Added documentation + MediaTypeMapper + RestResponseFactory
Added process-definition GET and collection GET
Added general docs + return 401 (not 403) when authentication fails
Added process-definition suspend and activate + tests
Small tweak, see  http://forums.activiti.org/content/problem-createtaskquerytaskcandidategroup-and-user
Merge branch 'master' of github.com:Activiti/Activiti
#ACT-1426: Fixing behavior in nested multi-instance tasks.
Including suspension/activation with delay and cascade in REST-resource
Added single task REST-resource and test
Added task-update and task-delete