ver14
ver15
Merge branch 'PawelNewMerge'

Conflicts:
	src/com/group8/controller/Controller.java
	src/com/group8/view/MaintainPanel.java
conflicts fixed
ReportPanel updated ,reservationPanel updated
small fixes
fixed null addressing bug in ReportPanel
tg
Merge branch 'master' of https://github.com/junysz/ProMusicaInventorySystem

Conflicts:
	src/com/group8/controller/Controller.java
	src/com/group8/view/ReportPanel.java
fixed null exception
Merge branch 'master' of https://github.com/junysz/ProMusicaInventorySystem

Conflicts:
	src/com/group8/controller/Controller.java
	src/com/group8/view/ReportPanel.java
Merge branch 'master' of https://github.com/junysz/ProMusicaInventorySystem

Conflicts:
	src/com/group8/controller/Controller.java
	src/com/group8/view/ReportPanel.java
fixed code after merging
fixed bug in reservationPanel
added a Jlist to ReservationPanel
Jlist
update
Merge branch 'master' into PawelNew
update from master
Added Listeners for ReservationPanel