add change from modx evolution develop branch
Merge branch 'master' into develop

* master:
  add change from modx evolution develop branch

Conflicts:
	manager/actions/search.static.php
	manager/includes/extenders/dbapi.mysqli.class.inc.php
	manager/includes/lang/english.inc.php
	manager/includes/lang/russian-UTF8.inc.php
	manager/includes/version.inc.php