all apps have form
fix merge conflict
wip
Merge branch 'master' of https://github.com/nlauer/Nano