fix settings files
fix confidence/score change.
settings change
fixed conflicts
fix alert aggregation
fix lib change
fix
fix
Merge branch 'b2g' into dev
docs