adding app config overwrite
Merge branch 'master' of github.com:turtl/desktop