Cambios
Merge branch 'master' of https://github.com/CedmundoMartinez/medired.git

Conflicts:
	MediRed/.classpath
	MediRed/bin/MediRed.apk
	MediRed/bin/R.txt
	MediRed/bin/classes.dex
	MediRed/bin/resources.ap_