Марат Commit
Merge origin/master

Conflicts:
	application/controllers/offer/add.php
	application/controllers/offer/view.php