fixed bug after merge
changed default.css
Merge branch 'master'