Layout tweaks.
Merge branch 'master' of git://github.com/MarkUsProject/Markus into sass-col
Apparently the icons aren't broken anymore...?
Merge conflicts resolved.
Fix for test warnings.
Merge conflicts
Merge pull request #1533 from arkon94/sass-col

Layout tweaks. Fixes #1490