Worked on Open Deur
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/mapper/OpenDeurMapper.java