Initialize User correctly
Some cleanup to the Account class
Merge remote-tracking branch 'origin/master'