DataTable cleanup and minor changes
Merge branch 'master' of github.com:gleez/cms