working activation on rest
fixed reset token typo
Merge branch 'dp' of github.com:enableiot/iotkit-agent into dp