fixed EventLines being black in charts
Fixed removing eventSegments breaking scaling
Merge branch 'bug-fixing' into sprint11