fixed ata paginator action column
Merge origin/master into amlak