nothing new
fixed merge conflicts
Merge branch 'develop' of https://github.com/mwiesenberger/feltor into develop