Added apis to get genres, artists and all songs
conflict resolve
Merge remote-tracking branch 'origin/a38leung'