Merge origin/master

Conflicts:
	Shop/derby.log