Rework on calendar, something less messy
Merge branch 'master' of https://github.com/Dorn-/accro