made some changes. Hybridtest and datatest now work. Working Version with 2 CBC.
Merge branch 'Dev' into GUI_Dev

Update to library from Dev
updated library