Modifications to introduce INT96
Merge branch 'timestamp' of https://github.com/dlanza1/parquet-mr.git
into timestamp

Conflicts:
	parquet-avro/src/main/java/parquet/avro/AvroSchemaConverter.java
	parquet-avro/src/main/java/parquet/avro/AvroWriteSupport.java