Nico

re commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/calendario_mascota.apk
	bin/resources.ap_