new cost algorithm for beams
Merge remote-tracking branch 'upstream/master'

Conflicts:
	build/vexflow/vexflow-min.js
Merge branch 'vexflowClef'
clef: ottava and small to annotation and size
Merge remote-tracking branch 'origin/master' into vexflowClef