new commits for column ordering
Merge branch 'master' of github.com:albertovasquez/richhtml
merging work
working on grid work
Merge commit 'dd61434'