fix doc
fix doc
Merge remote-tracking branch 'origin/master' into stable
bunch of fix
Merge branch 'stable' of https://github.com/makinacorpus/makina-states into stable