minor fix
debug2
merge3
debug2
merge3
Merge branch 'master' of github.com:FelixNeutatz/trackthetrackers

Conflicts:
	extraction/src/main/java/io/ssc/trackthetrackers/extraction/hadoop/AggregateScriptWatchersJob.java
	extraction/src/main/java/io/ssc/trackthetrackers/extraction/hadoop/ExtractionJob.java
	extraction/src/main/java/io/ssc/trackthetrackers/extraction/hadoop/HadoopJob.java
	extraction/src/main/java/io/ssc/trackthetrackers/extraction/resources/ResourceExtractor.java
extra module for Protobuf and Parquet projection
clean up
clean1
delete editor temp file
path configuration
Merge branch 'ParquetExtended' of github.com:FelixNeutatz/trackthetrackers into ParquetExtended
fix copy and paste error
Merge pull request #4 from FelixNeutatz/ParquetExtended

extra module for Protobuf and push down projection