some fixes
Merge branch 'fix-layout'
Merge branch 'master' of https://github.com/spyl94/znieh
fix requirejs and other