correct labels overriding combo
Merge branch 'V2_2' of github.com:afimb/chouette2 into V2_2
fix html tas in title, Mantis 24505