fixes/changes for datatable and block changes
Merge branch 'master' of https://github.com/shashin62/psadmin