Artist UI
Merge branch 'master' of
https://github.com/CienetAndroidStudy/musicplayer into brach

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/cienet/musicplayer/activity/MainViewActivity.java
	src/com/cienet/musicplayer/adapter/SongListAdapter.java
	src/com/cienet/musicplayer/fragment/SongListFragment.java