Added patch provided by conradi via the Activiti forum
Changed japanese message bundle as per http://forums.activiti.org/content/japanese-properties-activiti-explorer
Merge branch 'master' of https://github.com/Activiti/Activiti
Fix as described in http://forums.activiti.org/content/ldap-integration-error
Quick-Fix for ACT-1955 : Can not use table-driven editor (Kickstart) with LDAP-User
Fix for ACT-1978 : Obsolete signal subscriptions are not being removed, causing signals to be fired in old process definitons
Added option to specify deployment mode of
SpringProcessEngineConfiguration when auto deployment resources are
specified.

* There is a new optional property deploymentMode in
SpringProcessEngineConfiguration;
* Default behavior is the same as currently implemented: all resources
are grouped in a single deployment;
* New options are single-resource (each resource in a separate
deployment) and resource-parent-folder (group resources into deployments
for each parent folder);
* Updated existing testcases and added some new resources to cover
various scenarios;
* Updated documentation in Userguide;
Added option to specify deployment mode of
SpringProcessEngineConfiguration when auto deployment resources are
specified.

* There is a new optional property deploymentMode in
SpringProcessEngineConfiguration;
* Default behavior is the same as currently implemented: all resources
are grouped in a single deployment;
* New options are single-resource (each resource in a separate
deployment) and resource-parent-folder (group resources into deployments
for each parent folder);
* Updated existing testcases and added some new resources to cover
various scenarios;
* Updated documentation in Userguide;