merge commit
Merge branch 'master' of https://github.com/Desom/NUI_Code.git

Conflicts:
	Dynamic/Calibration.py
	Dynamic/DynamicSax.py
	Dynamic/IOFunctions.py