Changed difference logic, flipped pricematch offers
Merge branch 'master' into rob_branch