Changed Shop, added getters and setters
Merge remote-tracking branch 'origin/master'