Merge remote-tracking branch 'origin/master'

Conflicts:
	Proyecto#2/Interfaz/Perfil/Usuario.php
Merge remote-tracking branch 'origin/master'