Layout e exportacao

Adicao do layout e modificacao na migracao
Merge remote-tracking branch 'origin/master'

Conflicts:
	shopcode/templates/shop/cart.html
	shopcode/templates/shop/product_list.html