some flexgrid bug fixes
Merge branch 'master' into dialog

* master:
  some flexgrid bug fixes