Beginning selection of edge materials
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 develop