TAJO-1188: Fix testcase testTimestampConstructor in TestTimestampDatum. (DaeMyung Kang via hyunsik)
TAJO-1166: S3 related storage causes compilation error in Hadoop 2.6.0-SNAPSHOT. (jaehwa)

Closes #262
TAJO-1053: ADD PARTITIONS for HCatalogStore. (jaehwa)
TAJO-1209: Pluggable line (de)serializer for DelimitedTextFile.

Closes #1209
TAJO-1204: Remove unused ServerName class. (DaeMyung Kang via jaehwa)
TAJO-1165: Needs to show error messages on query_executor.jsp. (Jihun Kang via jaehwa)
TAJO-1119: JDBC driver should support TIMESTAMP type. (jaehwa)
TAJO-1095: Implement Json file scanner.

Closes #181
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into TAJO-1033

Conflicts:
	tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java
	tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto
	tajo-storage/pom.xml