Merge branches 'feature/basic-frontend' and 'master' of https://github.com/oakfang/karma
Merge branch 'master' of https://github.com/oakfang/karma