revert $in= '!\[\~([0-9]+)\~\]!ise'; // Use preg_replace with /e to make it evaluate PHP
Merge branch 'master' into develop

* master:
  revert $in= '!\[\~([0-9]+)\~\]!ise'; // Use preg_replace with /e to make it evaluate PHP

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