Merge remote-tracking branch 'upstream/next' into next
Merge remote-tracking branch 'upstream/account_transfer' into account_transfer
style fix
Merge pull request #89 from mmoadeli/MAID-573

Maid 573
Merge branch 'next' into MAID-554_CreateMaidAccount