修改打谱ui
Merge remote-tracking branch 'choose_remote_name/master' into
rmoteMaster

Conflicts:
	res/layout/main.xml
	res/values-zh-rCN/strings.xml