Fix AccountBean typo
Merge branch 'step-4' into step-5
Merge branch 'step-5' into step-6