fixed getData and getTexts
fixed corpus conflict

Merge branch 'dev' of https://github.com/kbenoit/quanteda into dev

Conflicts:
	R/corpus.R