Standares
Merge branch 'master' of https://github.com/AldoNavarreteBIGBOSS/sirmed_pingeso

Conflicts:
	SirmedWebApp/web/recuperarPass.xhtml