branch differences degraded too much, lets work on master until we have a bigger and more structured code base

Lars Quentinrequested to merge
linear_interpolation_branch into master

Merge request reports