Assets and layout for settings screen
Merge branch 'master' of https://github.com/nancydo/Match