Added  items_on_label_limit & group_label_items_by_sku to shipping_item
model and form
Set up the new weight scaling and summarize step for packing screen
Ability to link to packing screen directly from export page
Merge branch 'master' of c:\mcg\codebase\mcg-admin

Conflicts:
	protected/controllers/PackageController.php