commit
MAJ
Merge branch 'dev_david'
a lot of modification