update client, shop implementation
123
Merge branch 'master' into McLeodLaptop
Client side movement adjusted