Diagrammen map

Diagrammen map
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/View/EditorFrame.java