2 new commits pushed to

<https://github.com/jmpsec/osctrl/tree/develop|develop>

by javuto

<https://github.com/jmpsec/osctrl/commit/f90f6f380be568a21339aabb02adff95e61a8183|f90f6f38>

- Cleanup settings and last osctrl-admin references

<https://github.com/jmpsec/osctrl/commit/77758bde850115e876e89de2f2870bb24574629f|77758bde>

- Merge pull request #949 from jmpsec/cleanup-settings-admin jmpsec/osctrl