Merged Extrapolation and Data set

There are still some errors when switching between those two
Merge remote-tracking branch 'origin/master'

Conflicts:
	PythonPrototype/TestEnvironment.py
	PythonPrototype/datastructure2.py