Merge pull request #1 from alexfiore/login/logout

Login/logout
resolved m conflict
Merge branch 'master' of https://github.com/alexfiore/survey_gorilla into login/logout
css