Fixed reactivation and unlock in settings.
Merge branch 'master' of https://github.com/wlox/wlox-api