Merge branch 'develop'
files rename
Test second page
Extra pages added
DataTables added
Merge branch 'master' into develop

* master:
  DataTables added
  Extra pages added
  Test second page
  files rename