Client Join Estimation
delete default
Changes before merging with zhutao
Merge branch 'zhutao_new'

Conflicts:
	.cproject
	LogicalQueryPlan/Test/query_optmization_based_on_statisitic_test.cpp
	Test/TestMain.cpp