Solves issue stated on comment msg4254 for issue 956.
Fixed some CSS issues:
Changed the skinny class to have a margin-right of 15px
Added skinny and two-columns-* to components in the settings.html and settings_tab.html files.
Merge branch 'master' of github.com:froi/oh-mainline
Changed git message.