Fix rebase leftovers.
	modified:   libmscore/trill.cpp
	modified:   libmscore/marker.cpp
Added Markers and Jumps to barline ExtraInfo
	modified:   libmscore/barline.cpp
Fix bars and beats.
	modified:   mscore/scoreaccessibility.cpp