event calendar fixed
merged