Actualizar

subproduc
Newww
Merge branch 'master' of https://github.com/andrezinho/romero

Conflicts:
	lib/Spdo.php
Merge branch 'master' of https://github.com/andrezinho/romero