Merge branch 'develop' of https://github.com/XIMDEX/ximdex into feature/xedit-collaborative-warning
Showing a warning when a single node is being edited by two or more users.
Merge branch 'feature/xedit-collaborative-warning' into develop

Conflicts:
	actions/xmleditor2/Action_xmleditor2.class.php
Merge branch 'develop' of https://github.com/XIMDEX/ximdex into develop
Merge branch 'develop' of https://github.com/XIMDEX/ximdex into develop
Minor errors fixed and hide a DEBUG line
Merging develop branch with local changes