no message
no message
Merge branch 'master' of https://github.com/lyptik/openTSPS

Conflicts:
	standalone/openNI/openTSPS.xcodeproj/project.pbxproj