Arreglado
Merge branch 'master' of https://github.com/ChunkTrader/amazing-components

Conflicts:
	adminUsuarios.php
	classes/Usuario.php