fixed merge conflicts
Merge branch 'master' of https://github.com/alexfiore/survey_gorilla into login/logout
css
fixed merge conflicts