ver_1
Merge branch 'PawelNew' of https://github.com/junysz/ProMusicaInventorySystem into PawelNew

Conflicts:
	src/com/group8/controller/Controller.java
	src/com/group8/model/DataQueries.java
Here You go GAB conflicts fixed