Merge remote-tracking branch 'origin/master'

Conflicts:
	controllers/admin/promos.ctrl.php