finished extending cmApi, and tests
Merged 'dev'.
Finish twoFactorAuth