I changed the EventList class instance variable to a List of Events instead of an array as lists are much easier to deal with. Because it is private you need to call the method getEventList() before using any of the built in list methods.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.iml