Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/yilian/music/MainActivity.java
nihao
Merge branch 'master' of https://github.com/maoguangyi/yilianmusic.git