Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	ap/ChordDef.js
	scores/Song Six/Song Six page 1.svg
	scores/Song Six/Song Six page 10.svg
	scores/Song Six/Song Six page 11.svg
	scores/Song Six/Song Six page 12.svg
	scores/Song Six/Song Six page 13.svg
	scores/Song Six/Song Six page 2.svg
	scores/Song Six/Song Six page 3.svg
	scores/Song Six/Song Six page 4.svg
	scores/Song Six/Song Six page 5.svg
	scores/Song Six/Song Six page 6.svg
	scores/Song Six/Song Six page 7.svg
	scores/Song Six/Song Six page 8.svg
	scores/Song Six/Song Six page 9.svg
	scores/Song Six/Song Six.mkss
	scores/Study 2c3.1/Study 2c3.1 page 1.svg
	scores/Study 2c3.1/Study 2c3.1 page 2.svg
	scores/Study 2c3.1/Study 2c3.1 page 3.svg
	scores/Study 2c3.1/Study 2c3.1.mkss
	scores/Study 3 sketch 1/Study 3 sketch 1 page 1.svg
	scores/Study 3 sketch 1/Study 3 sketch 1 page 2.svg
	scores/Study 3 sketch 1/Study 3 sketch 1.mkss