diswizard
Merge branch 'master' of github.com:maciek-slon/DisCODe

Conflicts:
	share/Templates/src/Components/Component/TemplateComponent.cpp.tmpl
	share/Templates/src/Components/Component/TemplateComponent.hpp.tmp
	src/Tools/CMakeLists.txt
	src/Tools/diswizard.py
	src/Tools/diswizard.ui