More Junit tests for StockManagementPanel
Merge remote-tracking branch 'origin/master'

Conflicts:
	RetailSystem/resources/staff.json