antes de roma
Merge branch 'master' of https://github.com/senen2/pedidosg

Conflicts:
	js/jeditorlogo.js