protobuf dependency version changed from 2.4.1 to 2.5.0
protobuf dependency version changed from 2.4.1 to 2.5.0 - commit fix
 issue #324, move ParquetStringInspector to org.apache.hadoop.hive.serde2.objectinspector.primitive package
 issue #324, move ParquetStringInspector to org.apache.hadoop.hive.serde2.objectinspector.primitive package
Merge branch 'master' of https://github.com/Parquet/parquet-mr into issue324
Merge branch 'issue324' of github.com:tongjiechen/parquet-mr into issue324

Conflicts:
	parquet-hive/parquet-hive-storage-handler/src/main/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/ParquetStringInspector.java
Merge branch 'issue324' of github.com:tongjiechen/parquet-mr into issue324

remove additional tab
issue #324 remove additional tab
Merge branch 'issue324' of github.com:tongjiechen/parquet-mr into issue324
remove duplicate code
fix metadata concurency problem
Merge pull request #381 from Parquet/fix_concurency_problem

fix metadata concurency problem
[maven-release-plugin] prepare release parquet-1.4.3
[maven-release-plugin] prepare for next development iteration
protobuf 2.5 instalation script for Travis
protobuf 2.5 instalation script for Travis - build fix
protobuf 2.5 instalation script for Travis - pushd/popd
protobuf 2.5 instalation script for Travis - fix
protobuf 2.5 instalation script for Travis - remove make check
Merge pull request #337 from tongjiechen/issue324

 issue #324, move ParquetStringInspector to org.apache.hadoop.hive.serde...