added s->lu lu->s functions for event
resolved merge conflicts
moved struct to ffind.h // added calendar files