migrate
Merge branch 'dev' of http://github.com/jul77/confiture into dev