edit default/style.css
Merge branch 'master' into mysqli