edit bag
Merge branch 'hotfix'

Conflicts:
	protected/controllers/UsController.php