Merge origin/master into amlak

Conflicts:
	apps/api/controllers/SmsreceiverController.php