Test import
Merge remote-tracking branch 'KinectHelper/master'

Conflicts:
	.gitignore