product list - label descuento
images with changes
Merge branch 'master' of https://github.com/jdgomezb/oficomco

# By Mauricio Beltran
# Via Mauricio Beltran
* 'master' of https://github.com/jdgomezb/oficomco:
  Updates
  Images
  Images

Conflicts:
	media/catalog/product/C/e/CE260X.jpg
	media/catalog/product/C/e/CE285A.jpg
	media/catalog/product/C/e/CE312A.jpg
	media/catalog/product/C/e/CE313A.jpg
	media/catalog/product/C/e/CE323A.jpg
	media/catalog/product/C/e/CE341A.jpg
	media/catalog/product/C/e/CE402A.jpg
	media/catalog/product/C/e/CE410A.jpg
	media/catalog/product/C/e/CE413A.jpg