update sliding menu
fixe conflicts
Merge branch 'antonin'
Add ordre on station