Fixed bug that arises when a user logs in with no balance
Merge remote-tracking branch 'origin/master' into release-v1.0.0