delivery, freight and payment related change.
Merge branch 'master' of https://github.com/eliu03/WelHair