Added by Olga Brani over 7 years ago
Merge branch 'feature-newstyles' into develop
Conflicts: cloudcms/static/cloudcms/js/common.js cloudcms/templates/cms/base.html