Bug
Validadador
Merge branch 'master' into devp

Conflicts:
	package.json