Signed-off-by: cgpllx <cgpllx1@qq.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/activity_main.xml
	res/layout/list_track.xml
	res/values/colors.xml
	res/values/dimens.xml
	res/values/strings.xml
	src/com/konka/music/player/MusicPlayEngineImpl.java
	src/com/konka/music/service/IMusicControl.aidl
	src/com/konka/music/service/MusicService.java
	src/com/konka/music/ui/activity/MainActivity.java
	src/com/konka/music/ui/fragment/KBaseFragment.java
	src/com/konka/music/ui/fragment/LocalFragment.java