o
Merge branch 'master' of https://github.com/wyrllyn/JEEproject

Conflicts:
	src/controller/DatabaseInterface.java
	src/controller/Management.java
	src/model/Slot.java
	src/model/SlotControl.java