Merge branch 'next-demonic'
Bugfix: Correct css-property in status-display to allow background-color fallback in IE7
Merge branch 'master' into paleo