Merge branch 'master' of https://github.com/HazelChen/newBrand.git

Conflicts:
	stave/bin/view/write/tape/WholeTape.class
Merge branch 'master' of https://github.com/HazelChen/newBrand.git