fixes
Merge branch 'master' of github.com:severalnines/s9s-admin