many syle fixes
Merge branch 'bootstrap' of https://github.com/signumsoftware/framework into bootstrap