GØJLER FIX 

JOHN HITLER
GØJLER FIX 

JOHN HITLER
Merge origin/master

Conflicts:
	EESSBackend/src/java/dk/cphbusiness/model/Assembler.java
Merge origin/master

Conflicts:
	EESSBackend/src/java/dk/cphbusiness/model/Assembler.java