Added by Kostas Papadimitriou over 8 years ago
Merge branch 'newstyles'
Conflicts: cloudcms/templates/cms/base.html