deleted:    .idea/encodings.xml
	deleted:    .idea/misc.xml
	deleted:    .idea/modules.xml
	deleted:    .idea/ruby.iml
	deleted:    .idea/scopes/scope_settings.xml
	deleted:    .idea/vcs.xml
Merge branch 'dhell'
	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'