Made timeout 6 seconds again. Also changed getMyEventsTest to use the user id not email so it adds correctly
Merge branch 'master' of https://github.com/kfreedland/CS169GAP
fixed event send email with bad eventID