modifications on calendar and another ones // @TODO commit sql structure
modifications