Update Changelog for 2.0.2
Merge branch 'master' into event-delegation

Conflicts:
	CHANGELOG