Merge branch 'master' into develop

* master:
  DataTables added
  Extra pages added
  Test second page
  files rename
DataTables now uses in some tables
Merge branch 'develop'