Lots of shit
Merge branch 'master' into Seink

Conflicts:
	src/main/java/main/MainGuiFrame.form
	src/main/java/main/MainGuiFrame.java
	src/main/java/main/ManagerGui.java
	src/main/java/models/PDFGenerator.java