Added optional import of packages from bundle activiti-camel in the manifest of the bundle activiti-engine.
Check thread in forum (http://forums.activiti.org/content/activiti-camel-osgi-problem-imported-packages) for details on the problem
marked process property in lane as backreference, to avoid endless recursion and heap space error when marshalling json-model
Merge pull request #141 from gtudan/ACT-1801

ACT-1801: fix JSON-Serialisation of process with lanes
Merge pull request #136 from ojdiez/master

OSGi: optional import-package in activiti-engine for the packages of activiti-camel
ACT-1780: corrected REST user create/update docs
Merge remote-tracking branch 'upstream/master'