Merge remote-tracking branch 'upstream/account_transfer' into MAID-448
Merge pull request #68 from mmoadeli/MAID-448

Maid 448
Merge remote-tracking branch 'upstream/account_transfer' into MAID-519