Merge origin/natu

Conflicts:
	app/views/site/layouts/otheruser.blade.php


Merge echo

Cosas de users
Merge origin/master