Combined CVEDSP
Merge branch 'master' of https://github.com/digited/qtau

Conflicts:
	tools/rocatool/rocatool.cpp