minor stuff added, preparations for structure
Merge branch 'integration_kinect' of https://github.com/tsturm/sandstorm into integration_kinect