Merging from upstream
Merge branch 'master' of https://github.com/srmq/nlp.git

Conflicts:
	srmq-nlp/src/main/java/br/ufpe/cin/srmqnlp/RecursiveCWIndexWriter.java