Merge branch 'master' of https://github.com/LisonLiou/MusicPlayer

Conflicts:
	src/com/lison/musicplayer/MainActivity.java
	src/com/lison/musicplayer/PlayActivity.java
Merge branch 'master' of https://github.com/LisonLiou/MusicPlayer