Commit 08-05-2013
Merge branch 'master' of github.com:alvarotarquiola/tienda

Conflicts:
	admin21/tabs/AdminCatalog.php