Attempting to return events with times. Need to figure out how to serialize datetime obj
Added a datetime json renderer adapter. So now the json renderer can handle datetime objects.
Fixed conflict