Merge remote-tracking branch 'origin/master'

Conflicts:
	dDistEx14/src/EventReplayer.java