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

Conflicts:
	stave/bin/.gitignore
	stave/bin/logic/recognition/polymerization/Polymerization.class
	stave/bin/view/track_design/TrackFrame.class
	stave/bin/view/write/tape/LeftTape.class