Merge branch 'master' of https://github.com/artist-project/ARTIST
Merge remote-tracking branch 'origin/master'