lots of updates
many updates
Merge branch 'master' of https://github.com/fkunneman/ADNEXT

Conflicts:
	tweetprocessing/tweetsfeatures.py