Merge branch 'b-dev' of D:\WWW\oxideshop_trunk\eshop with conflicts.