Calendario !  :D
Revert "Calendario !  :D"

This reverts commit 9d86e7705d05f0dd67679c6c4f8c7aca15336861.
Merge origin/master