hold i toppen
Merge origin/master
hold i toppen
hold i toppen
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