Merge pull request #236 from bhariharan/unstable20

Merge branch 'unstable' into unstable20
make UI customizable via styles
Merge pull request #241 from superfell/master

Use styles to allow better customization of the UI
don't use <include> at the root of a layout, it'll crash at runtime.
Merge pull request #242 from superfell/master

fix for layout expansion crash on server picker.
Tag v1.4.7
Merge pull request #243 from bhariharan/master

Tag v1.4.7
Merge branch 'master' into unstable
Merge pull request #244 from bhariharan/unstable

Merge branch 'master' into unstable
Merge branch 'unstable' into unstable20