added combo behaivour dataFilter config
Tweek to jwic_controls.js
Merge remote branch 'origin/master'