Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into window_function

Conflicts:
	CHANGES
	tajo-algebra/src/main/java/org/apache/tajo/algebra/Expr.java