worked on the Beta setup app, rudementary favicon support
Merge branch 'master' of https://github.com/jothousand/surf