added genre relation to artist
jMerge branch 'master' into add-genres-to-artists
'merge commit'