pull test
Merge branch 'master' of https://github.com/atomicfaster/worldResidentAPS
add new function for activation with OTP on email and sms
Merge branch 'master' of https://github.com/atomicfaster/worldResidentAPS