EventStats Updated to have eventID
Push to resolve conflicts
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/EventStats.java