Pics, shop controller test
Maestro shipping + merge
Merge branch 'gwmSafeOld' of github.com:er777/gb into gwmSafeOld
Pics and a few small changes