refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	local_assets/complexStaves.png
correctly removed localassets