BetaVersion
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/help/media/mediah3lp/ArtistActivity.java
	app/src/main/java/com/help/media/mediah3lp/ArtistCardActivity.java
	app/src/main/java/com/help/media/mediah3lp/fragment/ArtisListFragment.java
	app/src/main/java/com/help/media/mediah3lp/fragment/ArtistCardFragment.java
	app/src/main/res/layout/activity_my.xml
	app/src/main/res/layout/artist_info_layout.xml