Changed locations
Merge branch 'master' of github.com:futureneer/openni2-tracker