modified:   CMakeLists.txt
modified:   Doxyfile
modified:   src/Algorithms/ParallelCyclotronTracker.cpp
modified:   src/BasicActions/Option.cpp
modified:   src/Classic/Algorithms/PBunchDefs.h
modified:   src/Classic/Algorithms/Tracker.cpp
modified:   src/Classic/Utilities/Options.cpp
modified:   src/Classic/Utilities/Options.h
modified:   src/Main.cpp
modified:   src/Solvers/PoissonSolver.h
modified:   src/Structure/DataSink.cpp
modified:   src/Structure/FieldSolver.cpp
modified:   src/Structure/FieldSolver.h
modified:   src/Track/Track.cpp

ParallelTTracker. Particle-Matter interaction doesn't work either at the moment.

I hope that I didn't create too much of a mess when merging!