added options to shop
shop options
shop options persistence
Merge branch 'shop'