Merge branch 'master' of https://github.com/knowledgehacker/ingest

Conflicts:
	src/main/java/ingest/DataIngester.java
	src/main/java/ingest/FileSystemOps.java
	src/main/java/ingest/Worker.java
	src/main/resources/config.properties
Fix merge error