Added DataTables script tags
Merged master