Fix ignore feature
Code cleaning, add option to disable chat merge
Merge remote-tracking branch 'origin/V2' into gh-pages