last Zuhal's changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	steer/controller/ajax/add.js
	steer/index.php