Merge remote-tracking branch 'liwang0923/master'

Conflicts:
	BlockStreamIterator/ParallelBlockStreamIterator/BlockStreamNestLoopJoinIterator.cpp
	LogicalQueryPlan/Test/testcrossjoin.cpp
Iterator Message overflows, when the query is too complex. (catalog and
conf are retained).
Merge remote branch 'fzh/master'

Conflicts:
	.gitignore
	BlockStreamIterator/ParallelBlockStreamIterator/BlockStreamNestLoopJoinIterator.cpp
	LogicalQueryPlan/Test/testcrossjoin.cpp
	catalogData.dat