fzhehe's contribution
Merge remote branch 'wangli/master'

Conflicts:
	.cproject
	.gitignore
	BlockStreamIterator/BlockStreamPrint.cpp
	Parsetree/Test/parser_test.cpp
	Test/TestMain.cpp
Before merging with Li's master
Merge branch 'fzu' into ExpandableFramework

Conflicts:
	Test/TestMain.cpp
	ids.h