update
Merge remote-tracking branch 'origin/master' into work

Conflicts:
	protected/models/Product.php
admin: groups