cambios yarebola

nada importante
Merge branch 'master' of https://github.com/jcpy/sfpy

Conflicts:
	ticket.txt