More Commenting and Arrangement
Merge branch 'master' into PawelNew
ver12
ver12
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
merge1
Merge branch 'PawelNewMerge'
fixed conflicts
conflicts fixed
Moved Jtable to view
fixed conflicts to master
fixed port number