Merge branch 'lukas_issue289_feat_cnn-model-class' into...

Merge branch 'lukas_issue289_feat_cnn-model-class' into 'lukas_issue306_feat_data-handler-fir-filter'

include cnn class

See merge request !300