style change
Merge branch 'feature/newcss' into django15