just commit
Merge branch 'improve_code' of github.com:shadow3x3x3/New_FPM into improve_code

Conflicts:
	AndroidManifest.xml
	src/com/fcuproject/musicplayer/GlobalVariable.java
	src/com/fcuproject/musicplayer/MainActivity.java
	src/com/fcuproject/service/MusicService.java