Login changes so it doesn't fail
Merge branch 'geocat_trunk' of github.com:camptocamp/geocat into geocat_trunk