Merge branch 'release/Massive_and_thinwalled_in_drawing'
Beginning selection of edge materials
Open by filetype
Merge branch 'hotfix/Open_by_filetype' into develop
Merge branch 'feature/DimensionDialog/Visualisation' into develop
Merge branch 'develop' into feature/DimensionDialog/Edge_materials

Conflicts:
	UserInterface/DimensionDialog.cpp
Material data model, population and selection in dimension dialog
Merge branch 'feature/DimensionDialog/Edge_materials' into feature/Dimensions_dialog

Conflicts:
	UserInterface/DrawModel.h
Rydding etter merge