edit CSS for default templates
Merge branch 'master' into mysqli