pre merge
(started slider for choosing color)
Merge branch 'master' of
ssh://git@github.com/BlueprintDevTeam/paritaire.git