fix row height will expand in columnlock
Merge branch '1.0' of https://github.com/oria/gridx into 1.0