updated price list
Merge branch 'master' into draft

* master:
  updated price list