repair error
Merge branch 'master' of github.com:zhoulzhou/IPCPlayer

Conflicts:
	src/com/example/ipcplayer/adapter/AllSongListAdapter.java

commit before merge  from origin