settings page styling
merge conflict fix
settings page done, working on preference-less nav, quicksand
Merge pull request #35 from kevinuhrmacher/master

settings done, working on nav and quicksand on userlist