Merge branch 'master' into updated-gems

Conflicts:
	Gemfile.lock
	app/views/deliveries/_form.html.haml

app/assets/javascripts/application.js

@@ -1,5 +1,6 @@
 //= require jquery
 //= require jquery_ujs
+//= require select2
 //= require twitter/bootstrap
 //= require jquery.tokeninput
 //= require bootstrap-datepicker/core
@@ -10,6 +11,7 @@
 //= require rails.validations.simple_form
 //= require_self
 //= require ordering
+//= require stupidtable
 
 // allow touch devices to work on click events
 //   http://stackoverflow.com/a/16221066
@@ -114,8 +116,15 @@ $(function() {
 
     // Use bootstrap datepicker for dateinput
     $('.datepicker').datepicker({format: 'yyyy-mm-dd', language: I18n.locale});
+    
+    // See stupidtable.js for initialization of local table sorting
 });
 
+// retrigger last local table sorting
+function updateSort(table) {
+  $('.sorting-asc, .sorting-desc', table).toggleClass('.sorting-asc .sorting-desc')
+    .removeData('sort-dir').trigger('click'); // CAUTION: removing data field of plugin
+}
 
 // gives the row an yellow background
 function highlightRow(checkbox) {