Resolve merge conflicts

app/assets/javascripts/application.js

@@ -4,8 +4,9 @@
 //= require select2
 //= require twitter/bootstrap
 //= require jquery.tokeninput
-//= require bootstrap-datepicker
-//= require bootstrap-datepicker.de
+//= require bootstrap-datepicker/core
+//= require bootstrap-datepicker/locales/bootstrap-datepicker.de
+//= require bootstrap-datepicker/locales/bootstrap-datepicker.nl
 //= require jquery.observe_field
 //= require rails.validations
 //= require_self
@@ -141,7 +142,7 @@ $(function() {
     });
 
     // Use bootstrap datepicker for dateinput
-    $('.datepicker').datepicker({format: 'yyyy-mm-dd', weekStart: 1, language: 'de'});
+    $('.datepicker').datepicker({format: 'yyyy-mm-dd', language: I18n.locale});
     
     // Init table sorting
     var myBars = $('.sorter-bar');

app/assets/stylesheets/application.css

@@ -2,4 +2,4 @@
 *= require bootstrap_and_overrides
 *= require select2
 *= require token-input-bootstrappy
-*/
+*= require bootstrap-datepicker

app/assets/stylesheets/bootstrap_and_overrides.css.less

@@ -31,10 +31,6 @@ body {
 // Example:
 // @linkColor: #ff0000;
 
-
-// Bootstrap datepicker
-@import "datepicker";
-
 // Custom styles
 
 // Fix empty dd tags in horizontal dl, see https://github.com/twitter/bootstrap/issues/4062