deleted:    shop/public/uploads/shoperw/item/image/2/iphone-4s-devices.jpg
	deleted:    shop/public/uploads/shoperw/item/image/2/thumb_iphone-4s-devices.jpg
Merge branch 'dhell'