Merge branch 'V7_dev'

diff --cc module_generator/__init__.py
Simple merge

diff --cc module_generator/cata_tmpl.py
Simple merge

diff --cc module_generator/cpp_tmpl.py
Simple merge

diff --cc module_generator/cppcompo.py
Simple merge

diff --cc module_generator/gener.py
Simple merge

diff --cc module_generator/hxx_para_tmpl.py
Simple merge

diff --cc module_generator/hxxcompo.py
Simple merge

diff --cc module_generator/hxxparacompo.py
Simple merge

diff --cc module_generator/pacocompo.py
Simple merge

diff --cc module_generator/yacsgen_version.py
Simple merge