Updating App Folders with UI and DataTables API
Fixed Merge Conflicts