TAJO-123: Clean up the logical plan's json format. (hyunsik)
TAJO-130: Same queryConf file conflicts. (jinho)
TAJO-84: Task scheduling with considering disk load balance. (jinho)
TAJO-127: Implement Tajo Resource Manager. (hyoungjunkim via hyunsik)
TAJO-127: Implement Tajo Resource Manager. (Fixed some missing changes)
TAJO-136: Broadcast join should be enabled. (hyunsik)
TAJO-59: Implement Char Datum Type. (jihoon)
TAJO-137: Unreleased resources and wrong allocation requests in TajoWorkerResourceManager. (hyoungjunkim via hyunsik)
TAJO-141: Set on demand as the default cluster mode. (hyunsik)
TAJO-94: Remove duplicate proto files. (hyunsik)
TAJO-142: Implement hash anti-join operator. (hyunsik)
TAJO-143: Implement hash semi-join operator. (hyunsik)
TAJO-134: Support for compression/decompression of CSVFile. (jinho)
TAJO-139: In predicate support. (hyunsik)
TAJO-141: Multiple union queries within a table subquery causes NPE. (hyunsik)
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tajo into CBO

Conflicts:
	tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/eval/EvalType.java
	tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/BasicLogicalPlanVisitor.java
	tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/FromTable.java
	tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/LogicalPlan.java
	tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/logical/ExceptNode.java
	tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/logical/ExprType.java
	tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/logical/IntersectNode.java
	tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/logical/NodeType.java
	tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/logical/ReceiveNode.java
	tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/logical/RelationNode.java
	tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/logical/SelectionNode.java
	tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/logical/SendNode.java
	tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/logical/UnionNode.java
	tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/GlobalEngine.java
	tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/GlobalPlanner.java
	tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryMaster.java
	tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryUnit.java
	tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/Repartitioner.java
	tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/worker/ResourceAllocator.java
	tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestEvalTree.java
	tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/TestLogicalPlanner.java
	tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/TestPlannerUtil.java
	tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/global/TestGlobalQueryOptimizer.java
	tajo-core/tajo-core-storage/src/main/java/org/apache/tajo/storage/Fragment.java