feat(rest) added name to activity instance dto
feat(engine/rest) Added activity name to activity instance interface
fix(webapp): group membership race condition
Merge branch 'master' of github.com:camunda/camunda-bpm-platform
chore(webapp): clear angular $http cache on logout
chore(integration-test): rename IndependentJobExecutorTest resource
Merge branch 'master' of github.com:camunda/camunda-bpm-platform
chore(qa): add method for IBM WAS testsuite
Merge branch 'master' of github.com:camunda/camunda-bpm-platform

Conflicts:
	qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/jobexecutor/IndependentJobExecutionTest.java
fix(cockpit): fix number of running instances in cockpit dashboard

Related to: #CAM-902
fix(maven-build): merge tomcat version to root pom - forgot some files
feat(engine): allow to inspect registered deployments from MBean

related to CAM-49
fix(tasklist): resolve task form using correct uri

Related to CAM-1057
improve(engine): allow registration only for existing deployments

- ManagementService#registerDeployment throws an exception, if the given
deployment does not exist

related to CAM-49
Merge branch 'master' of github.com:camunda/camunda-bpm-platform
fix(group): Fix confirmation dialog to add a group

related to CAM-1041
Merge branch 'master' of github.com:camunda/camunda-bpm-platform
test(engine-rest): test setting the application context path

related to CAM-977
Merge branch 'master' of github.com:camunda/camunda-bpm-platform
feat(ldap): add support for LDAP identity provider

- add support for Ldap Identity provider

- add support for configuration plugins in process engine

-remove available opertions links from resource representations to OPTIONS

related to #CAM-1023, #CAM-978, #CAM-833