Merge branch 'master' of https://franckamayou@github.com/IVPR/Weave.git
Merge branch 'master' of https://franckamayou@github.com/IVPR/Weave.git
pulling remote master into local
Merge branch 'fkamayou' of https://github.com/IVPR/Weave
fixing the color picker for DAs
Merge branch 'master' of https://github.com/IVPR/Weave into fkamayou