Merge branch 'hotfixes' of github.com:osclass/Osclass into hotfixes
minor fixes
Merge branch 'issue-doc' into develop