try to fix that playNext only last 1 second bug
Merge branch 'master' of https://github.com/LisonLiou/MusicPlayer

Conflicts:
	src/com/lison/musicplayer/PlayActivity.java
	src/com/service/audio/PlayerService.java