cambios en la gestion de eventos
nuevas annotations
Merge branch 'master' of https://github.com/leezsi/americana

Conflicts:
	.gitignore