some changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	mray0.3/kdtree.cpp
	mray0.3/kdtree.h
combine