Merge origin/master

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

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

Conflicts:
	Shop/dbname/db.lck
	Shop/dbname/log/log.ctrl
	Shop/dbname/log/log1.dat
	Shop/dbname/log/logmirror.ctrl
	Shop/derby.log
Merge origin/master

Conflicts:
	Shop/dbname/db.lck
	Shop/dbname/log/log.ctrl
	Shop/dbname/log/log1.dat
	Shop/dbname/log/logmirror.ctrl
	Shop/derby.log
Merge origin/master

Conflicts:
	Shop/dbname/db.lck
	Shop/dbname/log/log.ctrl
	Shop/dbname/log/log1.dat
	Shop/dbname/log/logmirror.ctrl
	Shop/derby.log
Merge origin/master

Conflicts:
	Shop/derby.log