Merge branch 'release/cleanup'
fixed a bug where one class ended at the same time as another started would be displayed as invalid because of time conflict #24
Merge branch 'hotfix/time_start_end_conflict' into develop