Done shop settings except pickup location.
Done pickup location.
Fixed issues #34,35,36,37,38
Merge branch 't4-shop-settings'

Merge