Merge origin/master

Conflicts:
	application/controllers/user/advertiser/offer/view.php
Merge origin/master