Merge branch 'reh-feature' into all
removed erroneous x shift of left barlines
Merge branch 'barlines-fix' into all

Conflicts:
	src/Measure.js
Merge branch 'all'