manually merge of calendar entries branch
add module for handling timespan fields
manually add custom sidejobs module