Merge origin/master

Conflicts:
	Shop/src/Shop/Vendor.java
Merge origin/master
Merge origin/master

Conflicts:
	Shop/src/Shop/Vendor.java