Updates to work with uWebshop 2.5.0.0
Merge remote-tracking branch 'origin/master'