Merge branch 'develop'
Changed Add Artist and View MB
Merge https://github.com/BenMagyar/headphones into develop