fix overlap issue in column & row Lock

cell in locked row and locked column will overlap when scroll vertically
Merge branch 'master' of https://github.com/oria/gridx