Start styling stuff
Merge conflict
prettify desktop control panel
Merge conflict.
Merge branch 'master' of http://github.com/keesjandevries/briefhack