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

app/assets/javascripts/application.js

@@ -20,6 +20,7 @@
 //= require settings/processing_items
 //= require jquery-ui
 //= require bootstrap-datepicker
+//= require jquery.datetimepicker
 
 $(document).on('turbolinks:load', function() {
   $('.datepicker').datepicker({

app/assets/stylesheets/application.scss

@@ -4,6 +4,7 @@
 @import "theme";
 @import "jquery-ui";
 @import "bootstrap-datepicker3";
+@import "jquery.datetimepicker";
 
 /* Show it is fixed to the top */
 // body {
@@ -75,5 +76,3 @@ select.form-control {
 }
 
 /*--- Reset --- */
-
-