befor changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	steer/add_new.php
	steer/controller/add/add_announce.php
	steer/controller/ajax/add.js