Merge branch 'master' of https://github.com/smeite/smeite into develop
Merge branch 'develop' of https://github.com/smeite/smeite into develop
adjust css and js