merge oxid b-dev-ce
Merge branch 'master' of https://github.com/robinlehrmann/oxideshop_ce-tests