fix wordcount
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/resa/topology/WordCountTopology.java