fixed settings on/off
Merge branch 'master' of https://github.com/sherpadesk/mobile-v3