Merge branch 'SalleBundle' into LoginBundle