dependency updates
mixed finky
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/farabiproject/example/WordCount.java