fixing test for login
Merge branch 'master' of github.com:Ecotrust/geosurvey into next-release