Puntos
Merge branch 'master'

Conflicts:
	src/cr/gov/ms/respiremossalud/MainActivity.java