.
Merge remote-tracking branch 'origin/master'

Conflicts:
	ConfigUsuarios.html
Revert "."

This reverts commit 3246124c906398d5ad9c81ca195f05db29c856a1.

Conflicts:
	ConfigUsuarios.html