Merge pull request #2 from fraleiz17/master

IntegrandoAnuncios
Se agrega el proceso de la tienda, limpieza del carrito, agregado de la compra, uso de los cupones
Pequenñas modificaciones...
Merge remote-tracking branch 'origin/martin' into martin

Conflicts:
	application/models/admin_model.php
	application/models/defaultdata_model.php
	application/views/general/menu_view.php
	application/views/index_view.php
	css/general.css
Merge branch 'martin' into MartinEE

Conflicts:
	application/views/general/menu_view.php
	application/views/index_view.php
	application/views/tienda_view.php
	application/views/usuario/myprofile_view.php
se hace commit por que contenia la linea

Deny from all

Solamente