Shitty bugg

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

Conflicts:
	sandbox/polyMapsExamples/examples/Adrien/clustering.js