More select2 fixes
Merge branch 'master' of git://github.com/MESD/FeatureContextBundle