Add color() function and refactoring
fixed merge conflicts
Merge branch 'secteur0-function-color'
documentation touchups