more fixes
more fixes
more fixes
Merge branch 'master' of https://github.com/ingwet/App
more fixes