Mofification after the merged version
testSort is ok.
doing test sort.
sort bug found!
a bug fixed in Single Column Scan
Merge branch 'casa'

Conflicts:
	.cproject
	.gitignore
	BlockStreamIterator/BlockStreamPrint.cpp
	Test/TestMain.cpp
	ids.h