bad travis merge
bad travis merge

babolivier/cozy-home,babolivier/cozy-home,jsilvestre/cozy-home,frankrousseau/cozy-home,jsilvestre/cozy-home,clochix/cozy-home,lemelon/cozy-home,lemelon/cozy-home,frankrousseau/cozy-home,clochix/cozy-home