Artist and Genre
Merge branch 'DevStream' of https://github.com/mittalprayag25/MSL.git
into DevStream

Conflicts:
	AndroidBuildingMusicPlayer/src/com/msl/MslBaseActivity.java
	AndroidBuildingMusicPlayer/src/com/msl/album/CustomAlbumView.java
	AndroidBuildingMusicPlayer/src/com/msl/defines/Defines.java
	AndroidBuildingMusicPlayer/src/com/msl/utilities/JSONParser.java
	AndroidBuildingMusicPlayer/src/com/msl/utils/Utils.java
Merge branch 'DevStream' of https://github.com/mittalprayag25/MSL.git
into DevStream

Conflicts:
	AndroidBuildingMusicPlayer/src/com/msl/dashboard/Dashboard.java