Arreglos Vista Admin
Merge origin/master