Alpha version
Merge branch 'master' of https://github.com/NitLab/NITOS-administration-tool into merge