2014.4.24 12:00
2014.4.24
2014.4.24 12:05
12:35
merge
Merge branch 'master' of https://github.com/HazelChen/newBrand

Conflicts:
	stave/bin/logic/recognition/pitchAnalysis/LinePitchToRealPitch.class
	stave/bin/logic/track/TrackTapeService.class
	stave/bin/view/write/tape/LeftTape.class
	stave/bin/view/write/tape/RightTape$1.class
	stave/bin/view/write/tape/WholeTape$3.class
	stave/bin/view/write/tape/WholeTape.class