pre merge commit
Merge branch 'master' of git://github.com/bluedynamics/bda.plone.shop
prepare at for notifications