Merge origin/master

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