Merge origin/master

Conflicts:
	src/BLL/BLLAlarm.java
	src/DAL/DBConnection.java
	src/GUI/ViewILFremmødeliste.java
	src/GUI/ViewILIndsats.java
	src/GUI/ViewMain.java
Merge origin/master

Conflicts:
	src/BLL/BLLAlarm.java
	src/DAL/DBConnection.java
	src/GUI/ViewILFremmødeliste.java
	src/GUI/ViewILIndsats.java
	src/GUI/ViewMain.java
Merge origin/master

Conflicts:
	src/BLL/BLLEmployee.java
	src/BLL/BLLFireman.java
	src/BLL/BLLLønPdf.java
	src/BLL/BLLOdinPdf.java
	src/BLL/BLLReport.java
	src/BLL/BLLUsage.java
	src/BLL/BLLVehicle.java
	src/GUI/ViewAdministration.java
	src/GUI/ViewHLAfterAction.java
	src/GUI/ViewILIndsats.form
	src/GUI/ViewILIndsats.java
	src/TableModels/TableModelLøn.java