a few changes in makeEventList - attempts to make function work failed...
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/gtsarandum/syncc/MainActivity.java