Retailer Changes

Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/backend/controllers/RetailerController.php
	protected/backend/views/retailer/_form.php
	protected/backend/views/retailer/_view.php
Merge branch 'master' of https://github.com/mrcnab/admin