add touch-icon markup
Merge branch 'master' of github.com:openplans/mobile-survey-client
Merge branch 'master' of github.com:openplans/mobile-survey-client
tweak styles & markup
fix merge conflict