Added by Kostas Papadimitriou about 11 years ago
Merge branch 'feature-newstyles' into release-0.13
Conflicts: cloudcms/templates/cms/base.html