Moving stuff around
Merge branch 'master' of https://github.com/dma-dk/e-Navigation

Conflicts:
	.classpath