Befor merge
Merge branch 'master' of https://github.com/TweetAggregator/TweetAggregator

Conflicts:
	test/ClusteringTests.scala