1) bugs fixed 2) language improvals 3) index optimization
language bugs fixed
Merge branch 'master' into localizaion_en