Merge branch 'feature/newcss'
Merge remote branch 'github/master'
style changes for mobile
Merge branch 'master' into feature/newcss
Merge branch 'master' into feature/newcss
Merge branch 'feature/newcss' into django15