CMG update
Merge branch 'master' of github.com-atos:artist-project/ARTIST