Merging of Time Recording Fields

Time recording is improved by merging the fields 'Type' and 'Activity'