Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant

app/assets/javascripts/application.js

@@ -20,13 +20,10 @@
 //= require settings/processing_items
 //= require jquery-ui
 //= require bootstrap-datepicker
-//= require jquery.datetimepicker
-//= require dataTables/jquery.dataTables
 //= require moment
 //= require daterangepicker
 //= require select2
-//= require bootstrap-datetimepicker
-//= require pickers
+//= require jquery.datetimepicker
 
 
 $(document).on('turbolinks:load', function() {

app/assets/stylesheets/application.scss

@@ -4,11 +4,9 @@
 @import "theme";
 @import "jquery-ui";
 @import "bootstrap-datepicker3";
-@import "jquery.datetimepicker";
-@import "dataTables/jquery.dataTables";
 @import "daterangepicker-bs3";
 @import "select2";
-@import "bootstrap-datetimepicker";
+@import "jquery.datetimepicker";
 
 /* Show it is fixed to the top */
 // body {