do not query firebase until we are logged in
Merge branch 'develop'