Added happening_today to event serialization
Move events between upcoming and user collections