add choose station and dashboard
fixe merge
fixe conflicts
Fix merge