bunch of things
Merge branch 'stable' of https://github.com/makinacorpus/makina-states into stable
Merge pull request #6 from makinacorpus/stable

Stable