Cambios reportar
Merge branch 'master' of ssh://git@github.com/gonzalobesil/comov.git

Conflicts:
	bin/ComoViajarBeta.apk
	bin/classes.dex
	bin/resources.ap_