cv
hny
Revert "hny"

This reverts commit 185cb48e01a014ed0c7163ce974bff59711bb2da.
More Commenting and Arrangement
Merge branch 'master' into PawelNew
ver12
fixed query subcat
ver12
sorted alphabetically lists in query
updated to master
45r4r4
Maintain Categories updated
Merge branch 'PawelMerge'

Conflicts:
	src/com/group8/model/DataQueries.java
conflict fixed
ver12
Merge branch 'PawelMerge'
ver13
Merge branch 'PawelNewMerge'
Merge branch 'master' of https://github.com/junysz/ProMusicaInventorySystem

Conflicts:
	src/com/group8/controller/Controller.java
	src/com/group8/view/MaintainPanel.java
ver14