Merge branch 'master' of https://github.com/hengling/OSManager2