senthil fixes
senthil fixes
merge conflicts
many fixes and changes
Merge remote-tracking branch 'origin/master'
All changes done except hover