pepe
Merge branch 'master' of https://github.com/juanmazalazar/productos

Conflicts:
	protected/runtime/application.log
log endae
Merge branch 'master' of https://github.com/juanmazalazar/productos
pase a linuxxxxxxxxxxx