Work on shop
Merge branch 'master' of https://github.com/mipe85/MovieStore.git