Conversion to lilypond complete
Merge branch 'render_branch'