chore(rest): make application in test server bootstraps configurable
feat(tree): Show instance tree in process diagram

- The instance tree represents the current process instance state which
  will be shown in the process diagram to a specific process instance

related to CAM-716
feat(act-instance): add TransitionInstance

- Add support for transition instances in  the activity instance tree.
  Transition instances represent executions waiting in asynchronous
  continutation.

related to #CAM-858
Merge branch 'master' of github.com:camunda/camunda-bpm-platform
feat(act-instances): add not-null checks

make sure activity instance is not null

related to #CAM-858
feat(tree): add transitions to diagram

related to CAM-716
fix(rest): add media type declaration to exception mappers

closes CAM-842
Merge branch 'master' of github.com:camunda/camunda-bpm-platform
feat(engine): expose EventSubscriptionQuery via RuntimeService

closes CAM-881
feat(rest): add GET for message event subscriptions

contributes to CAM-635
fix(compensation): after parallel GW

- fix throwing intermediate compensation event that throws compensation
  into an embedded subprocess after parallel gateway

- Testcases:
  * CompensateEventTest.testCompensateParallelSubprocess()
  * CompensateEventTest.testCompensateParallelSubprocessCompensationHandlerWaitstate()

fixes #CAM-886
Merge branch 'master' of github.com:camunda/camunda-bpm-platform

Conflicts:
	engine/src/test/java/org/camunda/bpm/engine/test/bpmn/subprocess/transaction/TransactionSubProcessTest.java
chore(merge): fix transaction testcase
refactor(BpmnDeployer): extract 'getNextVersion'

- rextracing process definition version generation into own method.
- facilitatates customization of version generation logic

related to #CAM-870
hack(capitalization) inconsistency in windows / git
feat(db-upgrade): add column ACT_INST_ID_

- alter execution table: add column ACT_INST_ID_

related to #CAM-858
chore(cockpit): enhance instance testcase
fix(db-upgrade): use varchar on postgres

related to #CAM-858
fix(ejb-pa): remove final method modifiers

- remove 'final' method modifiers in AbstractProcessApplication
- allows deployment on Weblogic

fixes #CAM-894
refactor(compensation): simplify get scope exe

- simplify logic for getting the scope execution.

related to #CAM-886