html y logoutservlet
Merge branch 'logout'