my feltor
Merge branch 'develop' of https://github.com/mwiesenberger/feltor into develop

Conflicts:
	src/feltor2D/feltor
fixed merge conflicts
new NEU in dz and new testfunction for dz_geom_t