ok done,wew
new music
Merge branch 'master' of https://github.com/tungha/DiamondTest into chordMerge

Conflicts:
	DiamondTest/src/com/cnc/diamond/adapter/DiamondChordManager.java
fix error detect