ever
Merge branch 'master' of https://github.com/cesarvf90/ProyectoRH

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