Refined date view on events-- removed year, repeated date. Removed year from appearing twice on event title
Fixed merge conflicts