Merge branch 'b-dev-ce' of git://github.com/kermie/oxideshop_ce into kermie-b-dev-ce