maj
Merge https://github.com/serut/vieassociative