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
ignore
ignore
remove unnecessary files
change gitignore file
fzhehe's contribution
Merge remote branch 'wangli/master'

Conflicts:
	.cproject
	.gitignore
	BlockStreamIterator/BlockStreamPrint.cpp
	Parsetree/Test/parser_test.cpp
	Test/TestMain.cpp
Before refine the codes in ExpandableAggregation
Before add Barrier Number into ExpandableBlockStreamIteratorBase
In the current version, theoretically, scan, filter, join, and
aggregation supports new expanded thread being added at any time during
the execution.
Before merging with Li's master
Before merging with My master branch
modified some file.
Merge branch 'LatestMaster' into ExpandableFramework

Conflicts:
	.cproject
	BlockStreamIterator/BlockStreamPrint.cpp
	Test/TestMain.cpp
	ids.h
Merge branch 'fzu' into ExpandableFramework

Conflicts:
	Test/TestMain.cpp
	ids.h