fixed user
Merge origin/master into amlak

Conflicts:
	apps/core/controllers/ControllerBase.php