adding key legend
Updating add event xml
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/com/example/campuseventsapp/MainActivity.java