wip
Merge branch 'master' of git://github.com/bluedynamics/bda.plone.shop