style updates
Merge branch 'master' into feature/newcss
Merge branch 'feature/newcss' into django15