read json
Merge branch 'master' of https://github.com/mmarroquin/tdi.1.2014

Conflicts:
	Spree/mystore/app/models/web_product.rb
read_json listo