version 1.1, back office
Merge branch 'tarot'