-updated models to work with new variant options branch
Merge branch 'watg' of github.com:watg/spree into watg

* 'watg' of github.com:watg/spree:
  do not ask product.weight when variant is master
  [logistic]: image sticker