wip
Merge branch 'develop' into testing-ninja
some improvements and fixes on test (admin)
Merge branch 'testing-ninja' into testing
Merge branch 'testing' of github.com:osclass/Osclass into testing