Update modules to Master, latest versions
Fixed markup for calendar entry