Merge branch 'new branch' of https://github.com/gathcon/RetailManagementSystem

Conflicts:
ProductListPanel.java