New v
Merge branch 'development_massi', aligning feature massi_1
Merge branch 'development_massi'

README is now OK
Merge branch 'master' into development_massi
Align