Just to have a commit to work with. Ignore this
Merge branch 'feature/DimensionDialog/Edge_materials' into feature/Dimensions_dialog

Conflicts:
	UserInterface/DrawModel.h
Rydding etter merge
Merge branch 'feature/Dimensions_dialog' into develop