fixed bug in dz.h
Merge branch 'develop' of leo3.uibk.ac.at:feltor into develop
energies in feltor, removed bug in energies
Merge branch 'develop' of github.com:mwiesenberger/feltor into develop
sigma_z in units of Pi
little bug in feltor_hpc.cpp
merge conflict in input.txt