+ framework
+ settings menu and temporary link from the homescreen
Merge branch 'master' of https://github.com/thementalgoose/zazen