resolving merge conflict
row header fixes
row header dynamic width and removed .infos
cleaning expandable.js
refactoring
merging
fixes in scrolling