Merge origin/master

Conflicts:
	Shop/dbname/db.lck
	Shop/derby.log
	Shop/src/Shop/MainPage.java