fixed
Merge remote-tracking branch 'remotes/origin/B2129' into develop

Conflicts:
	catalog/admin/includes/classes/access.php