-
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	DocOperations/class/Checks.class.php
	DocOperations/data/StartEndDoc.data.php