Merge branch 'V7_dev'

diff --cc CMakeLists.txt
Simple merge

diff --cc src/HEXABLOCKGUI/CMakeLists.txt
Simple merge

diff --cc src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.cxx
Simple merge

diff --cc src/HEXABLOCKGUI/MyDlgRef/CMakeLists.txt
Simple merge