Settings page almost done
Merge branch 'master' of https://github.com/jwanglof/TDP022-Mockup