1.1b-d7.0.18

Merge branch 'master' into develop

* master:
  update to 1.0.15-d6.18

Conflicts:
	manager/frames/nodes.php
	manager/includes/document.parser.class.inc.php
	manager/includes/version.inc.php