update for url rule and for admin editor
lbr host
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/modules/admin/views/product/product.php