diff integrated
Merge branch 'master' of https://github.com/tsturm/sandstorm

Conflicts:
	Sandstorm/SandstormKinect/SandstormKinectCore.cs