fixes
Merge branch 'zidanca2014' of git://github.com/plone/plonetheme.barceloneta into zidanca2014