Updated Overlay
merged.
please test everything because were some stranfe conflicts at
CalendarActivity