update style
change to style
Merge branch 'feature/newcss' into django15