Refactor Calendar
Merge branch 'master' of github.com:josepma/fofo