fix from 1.0.14 bug fix
Merge branch 'master' into develop

* master:
  fix from 1.0.14 bug fix

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