bug fix
bug fix2
merge shimashita-
Merge branch 'dev'

Conflicts:
	.gitignore
	dataset/trainData.txt
	objectPoseEstimation
	source/CRForest.cpp
	source/CRTree.cpp
	source/util.cpp
	testdata/testData1/rgb7/detectionResult_bottle.png
	testdata/testData1/rgb7/detectionResult_can.png
	testdata/testData1/rgb7/detectionResult_koaramarch.png
	testdata/testData1/rgb7/detectionResult_pack.png
	testdata/testData1/rgb7/vote_bottle.png
	testdata/testData1/rgb7/vote_can.png
	testdata/testData1/rgb7/vote_koaramarch.png
	testdata/testData1/rgb7/vote_pack.png
	testdata/testData1/rgb8/detectionResult_bottle.png
	testdata/testData1/rgb8/detectionResult_can.png
	testdata/testData1/rgb8/detectionResult_koaramarch.png
	testdata/testData1/rgb8/detectionResult_pack.png
	testdata/testData1/rgb8/vote_bottle.png
	testdata/testData1/rgb8/vote_can.png
	testdata/testData1/rgb8/vote_koaramarch.png
	testdata/testData1/rgb8/vote_pack.png
	trees/treetable000.txt
	trees/treetable000_timeResult.txt
	trees/treetable001.txt
	trees/treetable001_timeResult.txt
	trees/treetable002.txt
	trees/treetable002_timeResult.txt
	trees/treetable003.txt
	trees/treetable003_timeResult.txt
	trees/treetable004.txt
	trees/treetable004_timeResult.txt
	trees/treetable005.txt
	trees/treetable005_timeResult.txt
	trees/treetable006.txt
	trees/treetable006_timeResult.txt
	trees/treetable007.txt
	trees/treetable007_timeResult.txt
	trees/treetable008.txt
	trees/treetable008_timeResult.txt
	trees/treetable009.txt
	trees/treetable009_timeResult.txt
	trees/treetable010.txt
	trees/treetable010_timeResult.txt
	trees/treetable011.txt
	trees/treetable011_timeResult.txt
	trees/treetable012.txt
	trees/treetable012_timeResult.txt
	trees/treetable013.txt
	trees/treetable013_timeResult.txt
	trees/treetable014.txt
	trees/treetable014_timeResult.txt
	trees/treetable015.txt
	trees/treetable015_timeResult.txt
	trees/treetable016.txt
	trees/treetable016_timeResult.txt
	trees/treetable017.txt
	trees/treetable017_timeResult.txt
	trees/treetable018.txt
	trees/treetable018_timeResult.txt
	trees/treetable019.txt
	trees/treetable019_timeResult.txt
	trees/treetableclassDatabase000.txt
	trees/treetableclassDatabase001.txt
	trees/treetableclassDatabase002.txt
	trees/treetableclassDatabase003.txt
	trees/treetableclassDatabase004.txt
	trees/treetableclassDatabase005.txt
	trees/treetableclassDatabase006.txt
	trees/treetableclassDatabase007.txt
	trees/treetableclassDatabase008.txt
	trees/treetableclassDatabase009.txt
	trees/treetableclassDatabase010.txt
	trees/treetableclassDatabase011.txt
	trees/treetableclassDatabase012.txt
	trees/treetableclassDatabase013.txt
	trees/treetableclassDatabase014.txt
	trees/treetableclassDatabase015.txt
	trees/treetableclassDatabase016.txt
	trees/treetableclassDatabase017.txt
	trees/treetableclassDatabase018.txt
	trees/treetableclassDatabase019.txt