fix to login issues and loading animation going on forever
Merge branch 'master' of https://github.com/puffball/freebeer