my feltor stuff
Merge branch 'develop' of https://github.com/mwiesenberger/feltor into develop
fixed merge conflicts
ncdiag with fsa diagnostics and minor corrections for fsa structures