SVN generate some comflicts.

git-svn-id: https://repo.thevirtualbrain.org/testgit/trunk@31 a79c6d67-9624-418e-af80-2fa85c78f146
Fixed conflicts etc etc.

git-svn-id: https://repo.thevirtualbrain.org/testgit/trunk@32 a79c6d67-9624-418e-af80-2fa85c78f146