new dockmap implementation
Merge branch 'newmap' into maptest

Conflicts:
	src/main/java/org/nhl/containing/main/Controller.java