modified:   pom.xml
	deleted:    src/main/java/de/l3s/common/features/hadoop/TimeSeriesFeatures.java
	modified:   src/main/java/de/l3s/common/features/hadoop/TimeSeriesJob.java
	modified:   src/main/java/de/l3s/common/features/hadoop/TimeSeriesMapper.java
	modified:   src/main/java/de/l3s/common/features/hadoop/TimeSeriesReducer.java
	new file:   src/main/java/de/l3s/common/features/App.java
	modified:   src/main/java/de/l3s/common/features/hadoop/TimeSeriesJob.java
	modified:   src/main/java/de/l3s/common/features/hadoop/TimeSeriesMapper.java
	modified:   src/main/java/de/l3s/common/features/hadoop/TimeSeriesReducer.java
	new file:   src/main/java/de/l3s/common/hadoop/WholeFileInputFormat.java
	new file:   src/main/java/de/l3s/common/hadoop/WholeFileRecordReader.java
	modified:   src/main/java/de/l3s/common/models/timeseries/KeyData.java
	modified:   pom.xml
Merge branch 'master' of https://github.com/timetool/TemporalSearch