Merge branch 'master' of https://github.com/dlopezmm/AS_SigueMedica

Conflicts:
	app/src/main/java/com/metaservicios/sigue_medica/fragments/FinderFragment.java