diff --git a/README.md b/README.md
index 2365792..a1f15e5 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,8 @@
-**I will not continue to maintain this gem as I don't use Rails asset pipeline anymore, if you are interested, [contact me](mailto:tkrotoff@gmail.com).**
-
 # jQuery timepicker for Rails
+[![Gem Version](https://badge.fury.io/rb/jquery-timepicker-rails.png)](http://badge.fury.io/rb/jquery-timepicker-rails)
 
-jquery-timepicker packaged for the Rails 3.1+ asset pipeline.
-Check [jquery-timepicker project home page](http://github.com/jonthornton/jquery-timepicker).
+jquery-timepicker and Datepair.js packaged for the Rails 3.1+ asset pipeline.
+See the [jquery-timepicker project home page](http://github.com/jonthornton/jquery-timepicker) and the [Datepair.js home page](https://github.com/jonthornton/Datepair.js).
 
 ## Installation
 
@@ -29,16 +28,16 @@ Add the following stylesheet file to `app/assets/stylesheets/application.css`:
 
     *= require jquery.timepicker.css
 
-Optionally, you can also use `datepair.js`:
-
-    //= require datepair.js
+You can also include `Datepair.js`, and optionally it's accompanying jquery plugin, `jquery.datepair.js`:
 
-Most people will prefer to copy-paste this file in order to customize it.
+    //= require Datepair
+    //= require jquery.datepair.js
 
-jquery-timepicker depends on jQuery and [bootstrap-datepicker](http://github.com/eternicode/bootstrap-datepicker) or [jQuery UI Datepicker](http://jqueryui.com/demos/datepicker/).
+Datepair.js depends on [bootstrap-datepicker](http://github.com/eternicode/bootstrap-datepicker) or [jQuery UI Datepicker](http://jqueryui.com/demos/datepicker/).
+jquery-timepicker depends on `jQuery`.
 
 ## License
 
 jquery-timepicker is being developed by [Jon Thornton](http://jonthornton.com/) and is under [MIT license](http://en.wikipedia.org/wiki/MIT_License).
 
-This gem is also licensed under [MIT license](https://raw.github.com/tkrotoff/jquery-timepicker-rails/master/LICENSE).
+This gem is also licensed under [MIT license](https://raw.github.com/tkrotoff/jquery-timepicker-rails/master/LICENSE.txt).
diff --git a/jquery-timepicker-rails.gemspec b/jquery-timepicker-rails.gemspec
index 1572d95..cb5be28 100644
--- a/jquery-timepicker-rails.gemspec
+++ b/jquery-timepicker-rails.gemspec
@@ -6,11 +6,11 @@ require 'jquery-timepicker-rails/version'
 Gem::Specification.new do |spec|
   spec.name          = "jquery-timepicker-rails"
   spec.version       = Jquery::Timepicker::Rails::VERSION
-  spec.authors       = ["Tanguy Krotoff (jQuery plugin by Jon Thornton)"]
+  spec.authors       = ["Tanguy Krotoff (jQuery plugin by Jon Thornton)", "Fabio Cantoni"]
   spec.email         = ["tkrotoff@gmail.com"]
   spec.description   = %q{A jQuery timepicker plugin inspired by Google Calendar}
   spec.summary       = %q{jquery-timepicker packaged for the Rails 3.1+ asset pipeline}
-  spec.homepage      = "http://github.com/tkrotoff/jquery-timepicker-rails"
+  spec.homepage      = "https://github.com/cover/jquery-timepicker-rails"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
diff --git a/lib/jquery-timepicker-rails/version.rb b/lib/jquery-timepicker-rails/version.rb
index 05e8354..4134b04 100644
--- a/lib/jquery-timepicker-rails/version.rb
+++ b/lib/jquery-timepicker-rails/version.rb
@@ -1,7 +1,7 @@
 module Jquery
   module Timepicker
     module Rails
-      VERSION = "1.2.5.0"
+      VERSION = '1.11.10'
     end
   end
 end
diff --git a/vendor/assets/javascripts/Datepair.js b/vendor/assets/javascripts/Datepair.js
new file mode 100644
index 0000000..e57da6a
--- /dev/null
+++ b/vendor/assets/javascripts/Datepair.js
@@ -0,0 +1,361 @@
+/*!
+ * datepair.js v0.4.15 - A javascript plugin for intelligently selecting date and time ranges inspired by Google Calendar.
+ * Copyright (c) 2016 Jon Thornton - http://jonthornton.github.com/Datepair.js
+ * License: MIT
+ */
+
+(function(window, document) {
+
+	'use strict';
+
+	var _ONE_DAY = 86400000;
+	var jq = window.Zepto || window.jQuery;
+	
+	function simpleExtend(obj1, obj2) {
+		var out = obj2 || {};
+	
+		for (var i in obj1) {
+			if (!(i in out)) {
+				out[i] = obj1[i];
+			}
+		}
+	
+		return out;
+	}
+	
+	// IE's custom event support is totally borked.
+	// Use jQuery if possible
+	function triggerSimpleCustomEvent(el, eventName) {
+		if (jq) {
+			jq(el).trigger(eventName);
+		} else {
+			var event = document.createEvent('CustomEvent');
+			event.initCustomEvent(eventName, true, true, {});
+			el.dispatchEvent(event);
+		}
+	}
+	
+	// el.classList not supported by < IE10
+	// use jQuery if available
+	function hasClass(el, className) {
+		if (jq) {
+			return jq(el).hasClass(className);
+		} else {
+			return el.classList.contains(className);
+		}
+	}
+	
+	function Datepair(container, options) {
+		this.dateDelta = null;
+		this.timeDelta = null;
+		this._defaults =	{
+			startClass: 'start',
+			endClass: 'end',
+			timeClass: 'time',
+			dateClass: 'date',
+			defaultDateDelta: 0,
+			defaultTimeDelta: 3600000,
+			anchor: 'start',
+	
+			// defaults for jquery-timepicker; override when using other input widgets
+			parseTime: function(input){
+				return jq(input).timepicker('getTime');
+			},
+			updateTime: function(input, dateObj){
+				jq(input).timepicker('setTime', dateObj);
+			},
+			setMinTime: function(input, dateObj){
+				jq(input).timepicker('option', 'minTime', dateObj);
+			},
+	
+			// defaults for bootstrap datepicker; override when using other input widgets
+			parseDate: function(input){
+				return input.value && jq(input).datepicker('getDate');
+			},
+			updateDate: function(input, dateObj){
+				jq(input).datepicker('update', dateObj);
+			}
+		};
+	
+		this.container = container;
+		this.settings = simpleExtend(this._defaults, options);
+	
+		this.startDateInput = this.container.querySelector('.'+this.settings.startClass+'.'+this.settings.dateClass);
+		this.endDateInput = this.container.querySelector('.'+this.settings.endClass+'.'+this.settings.dateClass);
+		this.startTimeInput = this.container.querySelector('.'+this.settings.startClass+'.'+this.settings.timeClass);
+		this.endTimeInput = this.container.querySelector('.'+this.settings.endClass+'.'+this.settings.timeClass);
+	
+		// initialize date and time deltas
+		this.refresh();
+	
+		// init starts here
+		this._bindChangeHandler();
+	}
+	
+	Datepair.prototype = {
+		constructor: Datepair,
+	
+		option: function(key, value)
+		{
+			if (typeof key == 'object') {
+				this.settings = simpleExtend(this.settings, key);
+	
+			} else if (typeof key == 'string' && typeof value != 'undefined') {
+				this.settings[key] = value;
+	
+			} else if (typeof key == 'string') {
+				return this.settings[key];
+			}
+	
+			this._updateEndMintime();
+		},
+	
+		getTimeDiff: function()
+		{
+			// due to the fact that times can wrap around, timeDiff for any
+			// time-only pair will always be >= 0
+			var delta = this.dateDelta + this.timeDelta;
+			if (delta < 0 && (!this.startDateInput || !this.endDateInput) ) {
+				delta += _ONE_DAY;
+			}
+	
+			return delta;
+		},
+	
+		refresh: function()
+		{
+			if (this.startDateInput && this.startDateInput.value && this.endDateInput && this.endDateInput.value) {
+				var startDate = this.settings.parseDate(this.startDateInput);
+				var endDate = this.settings.parseDate(this.endDateInput);
+				if (startDate && endDate) {
+					this.dateDelta = endDate.getTime() - startDate.getTime();
+				}
+			}
+			if (this.startTimeInput && this.startTimeInput.value && this.endTimeInput && this.endTimeInput.value) {
+				var startTime = this.settings.parseTime(this.startTimeInput);
+				var endTime = this.settings.parseTime(this.endTimeInput);
+				if (startTime && endTime) {
+					this.timeDelta = endTime.getTime() - startTime.getTime();
+					this._updateEndMintime();
+				}
+			}
+		},
+	
+		remove: function()
+		{
+			this._unbindChangeHandler();
+		},
+	
+		_bindChangeHandler: function(){
+			// addEventListener doesn't work with synthetic "change" events
+			// fired by jQuery's trigger() functioin. If jQuery is present,
+			// use that for event binding
+			if (jq) {
+				jq(this.container).on('change.datepair', jq.proxy(this.handleEvent, this));
+			} else {
+				this.container.addEventListener('change', this, false);
+			}
+		},
+	
+		_unbindChangeHandler: function(){
+			if (jq) {
+				jq(this.container).off('change.datepair');
+			} else {
+				this.container.removeEventListener('change', this, false);
+			}
+		},
+	
+		// This function will be called when passing 'this' to addEventListener
+		handleEvent: function(e){
+			// temporarily unbind the change handler to prevent triggering this
+			// if we update other inputs
+			this._unbindChangeHandler();
+	
+			if (hasClass(e.target, this.settings.dateClass)) {
+				if (e.target.value != '') {
+					this._dateChanged(e.target);
+					this._timeChanged(e.target);
+				} else {
+					this.dateDelta = null;
+				}
+	
+			} else if (hasClass(e.target, this.settings.timeClass)) {
+				if (e.target.value != '') {
+					this._timeChanged(e.target);
+				} else {
+					this.timeDelta = null;
+				}
+			}
+	
+			this._validateRanges();
+			this._updateEndMintime();
+			this._bindChangeHandler();
+		},
+	
+		_dateChanged: function(target){
+			if (!this.startDateInput || !this.endDateInput) {
+				return;
+			}
+	
+			var startDate = this.settings.parseDate(this.startDateInput);
+			var endDate = this.settings.parseDate(this.endDateInput);
+	
+			if (!startDate || !endDate) {
+				if (this.settings.defaultDateDelta !== null) {
+					if (startDate) {
+						var newEnd = new Date(startDate.getTime() + this.settings.defaultDateDelta * _ONE_DAY);
+						this.settings.updateDate(this.endDateInput, newEnd);
+	
+					} else if (endDate) {
+						var newStart = new Date(endDate.getTime() - this.settings.defaultDateDelta * _ONE_DAY);
+						this.settings.updateDate(this.startDateInput, newStart);
+					}
+	
+					this.dateDelta = this.settings.defaultDateDelta * _ONE_DAY;
+				} else {
+					this.dateDelta = null;
+				}
+	
+				return;
+			}
+	
+			if (this.settings.anchor == 'start' && hasClass(target, this.settings.startClass)) {
+				var newDate = new Date(startDate.getTime() + this.dateDelta);
+				this.settings.updateDate(this.endDateInput, newDate);
+			} else if (this.settings.anchor == 'end' && hasClass(target, this.settings.endClass)) {
+				var newDate = new Date(endDate.getTime() - this.dateDelta);
+				this.settings.updateDate(this.startDateInput, newDate);
+			} else {
+				if (endDate < startDate) {
+					var otherInput = hasClass(target, this.settings.startClass) ? this.endDateInput : this.startDateInput;
+					var selectedDate = this.settings.parseDate(target);
+					this.dateDelta = 0;
+					this.settings.updateDate(otherInput, selectedDate);
+				} else {
+					this.dateDelta = endDate.getTime() - startDate.getTime();
+				}
+			}
+		},
+	
+		_timeChanged: function(target){
+			if (!this.startTimeInput || !this.endTimeInput) {
+				return;
+			}
+	
+			var startTime = this.settings.parseTime(this.startTimeInput);
+			var endTime = this.settings.parseTime(this.endTimeInput);
+	
+			if (!startTime || !endTime) {
+				if (this.settings.defaultTimeDelta !== null) {
+					if (startTime) {
+						var newEnd = new Date(startTime.getTime() + this.settings.defaultTimeDelta);
+						this.settings.updateTime(this.endTimeInput, newEnd);
+					} else if (endTime) {
+						var newStart = new Date(endTime.getTime() - this.settings.defaultTimeDelta);
+						this.settings.updateTime(this.startTimeInput, newStart);
+					}
+	
+					this.timeDelta = this.settings.defaultTimeDelta;
+				} else {
+					this.timeDelta = null;
+				}
+	
+				return;
+			}
+	
+			if (this.settings.anchor == 'start' && hasClass(target, this.settings.startClass)) {
+				var newTime = new Date(startTime.getTime() + this.timeDelta);
+				this.settings.updateTime(this.endTimeInput, newTime);
+				endTime = this.settings.parseTime(this.endTimeInput);
+	
+				this._doMidnightRollover(startTime, endTime);
+			} else if (this.settings.anchor == 'end' && hasClass(target, this.settings.endClass)) {
+				var newTime = new Date(endTime.getTime() - this.timeDelta);
+				this.settings.updateTime(this.startTimeInput, newTime);
+				startTime = this.settings.parseTime(this.startTimeInput);
+	
+				this._doMidnightRollover(startTime, endTime);
+			} else {
+				this._doMidnightRollover(startTime, endTime);
+	
+				var startDate, endDate;
+				if (this.startDateInput && this.endDateInput) {
+					startDate = this.settings.parseDate(this.startDateInput);
+					endDate = this.settings.parseDate(this.endDateInput);
+				}
+	
+				if ((+startDate == +endDate) && (endTime < startTime)) {
+					var thisInput  = hasClass(target, this.settings.endClass) ? this.endTimeInput : this.startTimeInput;
+					var otherInput = hasClass(target, this.settings.startClass) ? this.endTimeInput : this.startTimeInput;
+					var selectedTime = this.settings.parseTime(thisInput);
+					this.timeDelta = 0;
+					this.settings.updateTime(otherInput, selectedTime);
+				} else {
+					this.timeDelta = endTime.getTime() - startTime.getTime();
+				}
+			}
+	
+	
+		},
+	
+		_doMidnightRollover: function(startTime, endTime) {
+			if (!this.startDateInput || !this.endDateInput) {
+				return;
+			}
+	
+			var endDate = this.settings.parseDate(this.endDateInput);
+			var startDate = this.settings.parseDate(this.startDateInput);
+			var newDelta = endTime.getTime() - startTime.getTime();
+			var offset = (endTime < startTime) ? _ONE_DAY : -1 * _ONE_DAY;
+	
+			if (this.dateDelta !== null
+					&& this.dateDelta + this.timeDelta <= _ONE_DAY
+					&& this.dateDelta + newDelta != 0
+					&& (offset > 0 || this.dateDelta != 0)
+					&& ((newDelta >= 0 && this.timeDelta < 0) || (newDelta < 0 && this.timeDelta >= 0))) {
+	
+				if (this.settings.anchor == 'start') {
+					this.settings.updateDate(this.endDateInput, new Date(endDate.getTime() + offset));
+					this._dateChanged(this.endDateInput);
+				} else if (this.settings.anchor == 'end') {
+					this.settings.updateDate(this.startDateInput, new Date(startDate.getTime() - offset));
+					this._dateChanged(this.startDateInput);
+				}
+			}
+			this.timeDelta = newDelta;
+		},
+	
+		_updateEndMintime: function(){
+			if (typeof this.settings.setMinTime != 'function') return;
+	
+			var baseTime = null;
+			if (this.settings.anchor == 'start' && (!this.dateDelta || this.dateDelta < _ONE_DAY || (this.timeDelta && this.dateDelta + this.timeDelta < _ONE_DAY))) {
+				baseTime = this.settings.parseTime(this.startTimeInput);
+			}
+	
+			this.settings.setMinTime(this.endTimeInput, baseTime);
+		},
+	
+		_validateRanges: function(){
+			if (this.startTimeInput && this.endTimeInput && this.timeDelta === null) {
+				triggerSimpleCustomEvent(this.container, 'rangeIncomplete');
+				return;
+			}
+	
+			if (this.startDateInput && this.endDateInput && this.dateDelta === null) {
+				triggerSimpleCustomEvent(this.container, 'rangeIncomplete');
+				return;
+			}
+	
+			// due to the fact that times can wrap around, any time-only pair will be considered valid
+			if (!this.startDateInput || !this.endDateInput || this.dateDelta + this.timeDelta >= 0) {
+				triggerSimpleCustomEvent(this.container, 'rangeSelected');
+			} else {
+				triggerSimpleCustomEvent(this.container, 'rangeError');
+			}
+		}
+	};
+
+	window.Datepair = Datepair;
+
+}(window, document));
\ No newline at end of file
diff --git a/vendor/assets/javascripts/datepair.js b/vendor/assets/javascripts/datepair.js
deleted file mode 100755
index d01d796..0000000
--- a/vendor/assets/javascripts/datepair.js
+++ /dev/null
@@ -1,226 +0,0 @@
-$(function() {
-	var DATEPICKER_FORMAT = 'yyyy-m-d';
-	var TIMEPICKER_FORMAT = 'g:ia';
-	var DATE_FORMAT = 'Y-n-j'; // for this format see http://php.net/manual/function.date.php
-
-	$('.datepair input.date').each(function(){
-		var $this = $(this);
-
-		$this.datepicker({
-			'format': DATEPICKER_FORMAT,
-			'autoclose': true
-		});
-
-		if ($this.hasClass('start') || $this.hasClass('end')) {
-			$this.on('changeDate change', doDatepair);
-		}
-
-	});
-
-	$('.datepair input.time').each(function() {
-		var $this = $(this);
-		
-		$this.timepicker({
-			'showDuration': true,
-			'timeFormat': TIMEPICKER_FORMAT,
-			'scrollDefaultNow': true
-		});
-
-		if ($this.hasClass('start') || $this.hasClass('end')) {
-			$this.on('changeTime change', doDatepair);
-		}
-		
-		if ($this.hasClass('end')) {
-			$this.on('focus', function(){$('.ui-timepicker-with-duration').scrollTop(0);});
-		}		
-
-	});
-
-	$('.datepair').each(initDatepair);
-
-	function initDatepair()
-	{
-		var container = $(this);
-
-		var startDateInput = container.find('input.start.date');
-		var endDateInput = container.find('input.end.date');
-		var dateDelta = 0;
-
-		if (startDateInput.length && endDateInput.length) {
-			var startDate = parseDate(startDateInput.val(), DATEPICKER_FORMAT);
-			var endDate =  parseDate(endDateInput.val(), DATEPICKER_FORMAT);
-
-			dateDelta = endDate.getTime() - startDate.getTime();
-			container.data('dateDelta', dateDelta);
-		}
-
-		var startTimeInput = container.find('input.start.time');
-		var endTimeInput = container.find('input.end.time');
-
-		if (startTimeInput.length && endTimeInput.length) {
-			var startInt = startTimeInput.timepicker('getSecondsFromMidnight');
-			var endInt = endTimeInput.timepicker('getSecondsFromMidnight');
-
-			container.data('timeDelta', endInt - startInt);
-
-			if (dateDelta < 86400000) {
-				endTimeInput.timepicker('option', 'minTime', startInt);
-			}
-		}
-	}
-
-	function doDatepair()
-	{
-		var target = $(this);
-		if (target.val() == '') {
-			return;
-		}
-
-		var container = target.closest('.datepair');
-
-		if (target.hasClass('date')) {
-			updateDatePair(target, container);
-
-		} else if (target.hasClass('time')) {
-			updateTimePair(target, container);
-		}
-	}
-
-	function updateDatePair(target, container)
-	{
-		var start = container.find('input.start.date');
-		var end = container.find('input.end.date');
-		if (!start.length || !end.length) {
-			return;
-		}
-
-		var startDate = parseDate(start.val(), DATEPICKER_FORMAT);
-		var endDate =  parseDate(end.val(), DATEPICKER_FORMAT);
-
-		var oldDelta = container.data('dateDelta');
-
-		if (!isNaN(oldDelta) && oldDelta !== null && target.hasClass('start')) {
-			var newEnd = new Date(startDate.getTime()+oldDelta);
-			end.val(newEnd.format(DATE_FORMAT));
-			end.datepicker('update');
-			return;
-
-		} else {
-			var newDelta = endDate.getTime() - startDate.getTime();
-
-			if (newDelta < 0) {
-				newDelta = 0;
-
-				if (target.hasClass('start')) {
-					end.val(start.val());
-					end.datepicker('update');
-				} else if (target.hasClass('end')) {
-					start.val(end.val());
-					start.datepicker('update');
-				}
-			}
-
-			if (newDelta < 86400000) {
-				var startTimeVal = container.find('input.start.time').val();
-
-				if (startTimeVal) {
-					container.find('input.end.time').timepicker('option', {'minTime': startTimeVal});
-				}
-			} else {
-				container.find('input.end.time').timepicker('option', {'minTime': null});
-			}
-
-			container.data('dateDelta', newDelta);
-		}
-	}
-
-	function updateTimePair(target, container)
-	{
-		var start = container.find('input.start.time');
-		var end = container.find('input.end.time');
-
-		if (!start.length) {
-			return;
-		}
-
-		var startInt = start.timepicker('getSecondsFromMidnight');
-		var dateDelta = container.data('dateDelta');
-
-		if (target.hasClass('start') && (!dateDelta || dateDelta < 86400000)) {
-			end.timepicker('option', 'minTime', startInt);
-		}
-
-		if (!end.length) {
-			return;
-		}
-
-		var endInt = end.timepicker('getSecondsFromMidnight');
-		var oldDelta = container.data('timeDelta');
-
-		var endDateAdvance = 0;
-		var newDelta;
-
-		if (oldDelta && target.hasClass('start')) {
-			// lock the duration and advance the end time
-
-			var newEnd = (startInt+oldDelta)%86400;
-
-			if (newEnd < 0) {
-				newEnd += 86400;
-			}
-
-			end.timepicker('setTime', newEnd);
-			newDelta = newEnd - startInt;
-		} else if (startInt !== null && endInt !== null) {
-			newDelta = endInt - startInt;
-		} else {
-			return;
-		}
-
-		container.data('timeDelta', newDelta);
-
-		if (newDelta < 0 && (!oldDelta || oldDelta > 0)) {
-			// overnight time span. advance the end date 1 day
-			endDateAdvance = 86400000;
-
-		} else if (newDelta > 0 && oldDelta < 0) {
-			// switching from overnight to same-day time span. decrease the end date 1 day
-			endDateAdvance = -86400000;
-		}
-
-		var startInput = container.find('.start.date');
-		var endInput = container.find('.end.date');
-
-		if (startInput.val() && !endInput.val()) {
-			endInput.val(startInput.val());
-			endInput.datepicker('update');
-			dateDelta = 0;
-			container.data('dateDelta', 0);
-		}
-
-		if (endDateAdvance != 0) {
-			if (dateDelta || dateDelta === 0) {
-				var endDate =  parseDate(endInput.val(), DATEPICKER_FORMAT);
-				var newEnd = new Date(endDate.getTime() + endDateAdvance);
-				endInput.val(newEnd.format(DATE_FORMAT));
-				endInput.datepicker('update');
-				container.data('dateDelta', dateDelta + endDateAdvance);
-			}
-		}
-	}
-});
-
-function parseDate(input, format) {
-	if (input == '')
-		return new Date('');
-
-	format = format || 'yyyy-mm-dd'; // default format
-	var parts = input.match(/(\d+)/g), i = 0, fmt = {};
-	// extract date-part indexes from the format
-	format.replace(/(yyyy|dd?|mm?)/g, function(part) { fmt[part] = i++; });
-
-	return new Date(parts[fmt['yyyy']], parts[fmt['mm'] == undefined ? fmt['m'] : fmt['mm']]-1, parts[fmt['dd'] == undefined ? fmt['d'] : fmt['dd']]);
-}
-
-// Simulates PHP's date function
-Date.prototype.format=function(format){var returnStr='';var replace=Date.replaceChars;for(var i=0;i<format.length;i++){var curChar=format.charAt(i);if(replace[curChar]){returnStr+=replace[curChar].call(this);}else{returnStr+=curChar;}}return returnStr;};Date.replaceChars={shortMonths:['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'],longMonths:['January','February','March','April','May','June','July','August','September','October','November','December'],shortDays:['Sun','Mon','Tue','Wed','Thu','Fri','Sat'],longDays:['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'],d:function(){return(this.getDate()<10?'0':'')+this.getDate();},D:function(){return Date.replaceChars.shortDays[this.getDay()];},j:function(){return this.getDate();},l:function(){return Date.replaceChars.longDays[this.getDay()];},N:function(){return this.getDay()+1;},S:function(){return(this.getDate()%10==1&&this.getDate()!=11?'st':(this.getDate()%10==2&&this.getDate()!=12?'nd':(this.getDate()%10==3&&this.getDate()!=13?'rd':'th')));},w:function(){return this.getDay();},z:function(){return"Not Yet Supported";},W:function(){return"Not Yet Supported";},F:function(){return Date.replaceChars.longMonths[this.getMonth()];},m:function(){return(this.getMonth()<9?'0':'')+(this.getMonth()+1);},M:function(){return Date.replaceChars.shortMonths[this.getMonth()];},n:function(){return this.getMonth()+1;},t:function(){return"Not Yet Supported";},L:function(){return(((this.getFullYear()%4==0)&&(this.getFullYear()%100!=0))||(this.getFullYear()%400==0))?'1':'0';},o:function(){return"Not Supported";},Y:function(){return this.getFullYear();},y:function(){return(''+this.getFullYear()).substr(2);},a:function(){return this.getHours()<12?'am':'pm';},A:function(){return this.getHours()<12?'AM':'PM';},B:function(){return"Not Yet Supported";},g:function(){return this.getHours()%12||12;},G:function(){return this.getHours();},h:function(){return((this.getHours()%12||12)<10?'0':'')+(this.getHours()%12||12);},H:function(){return(this.getHours()<10?'0':'')+this.getHours();},i:function(){return(this.getMinutes()<10?'0':'')+this.getMinutes();},s:function(){return(this.getSeconds()<10?'0':'')+this.getSeconds();},e:function(){return"Not Yet Supported";},I:function(){return"Not Supported";},O:function(){return(-this.getTimezoneOffset()<0?'-':'+')+(Math.abs(this.getTimezoneOffset()/60)<10?'0':'')+(Math.abs(this.getTimezoneOffset()/60))+'00';},P:function(){return(-this.getTimezoneOffset()<0?'-':'+')+(Math.abs(this.getTimezoneOffset()/60)<10?'0':'')+(Math.abs(this.getTimezoneOffset()/60))+':'+(Math.abs(this.getTimezoneOffset()%60)<10?'0':'')+(Math.abs(this.getTimezoneOffset()%60));},T:function(){var m=this.getMonth();this.setMonth(0);var result=this.toTimeString().replace(/^.+ \(?([^\)]+)\)?$/,'$1');this.setMonth(m);return result;},Z:function(){return-this.getTimezoneOffset()*60;},c:function(){return this.format("Y-m-d")+"T"+this.format("H:i:sP");},r:function(){return this.toString();},U:function(){return this.getTime()/1000;}};
diff --git a/vendor/assets/javascripts/jquery.datepair.js b/vendor/assets/javascripts/jquery.datepair.js
new file mode 100644
index 0000000..f043199
--- /dev/null
+++ b/vendor/assets/javascripts/jquery.datepair.js
@@ -0,0 +1,51 @@
+/*!
+ * datepair.js v0.4.15 - A javascript plugin for intelligently selecting date and time ranges inspired by Google Calendar.
+ * Copyright (c) 2016 Jon Thornton - http://jonthornton.github.com/Datepair.js
+ * License: MIT
+ */
+
+(function($) {
+
+	if(!$) {
+		return;
+	}
+
+	////////////
+	// Plugin //
+	////////////
+
+	$.fn.datepair = function(option) {
+		var out;
+		this.each(function() {
+			var $this = $(this);
+			var data = $this.data('datepair');
+			var options = typeof option === 'object' && option;
+
+			if (!data) {
+				data = new Datepair(this, options);
+				$this.data('datepair', data);
+			}
+
+			if (option === 'remove') {
+				out = data['remove']();
+				$this.removeData('datepair', data);
+			}
+
+			if (typeof option === 'string') {
+				out = data[option]();
+			}
+		});
+
+		return out || this;
+	};
+
+	//////////////
+	// Data API //
+	//////////////
+
+	$('[data-datepair]').each(function() {
+		var $this = $(this);
+		$this.datepair($this.data());
+	});
+
+}(window.Zepto || window.jQuery));
\ No newline at end of file
diff --git a/vendor/assets/javascripts/jquery.timepicker.js b/vendor/assets/javascripts/jquery.timepicker.js
index b7bf38c..e5a7aeb 100644
--- a/vendor/assets/javascripts/jquery.timepicker.js
+++ b/vendor/assets/javascripts/jquery.timepicker.js
@@ -1,13 +1,16 @@
-/************************
-jquery-timepicker v1.2.5
-http://jonthornton.github.com/jquery-timepicker/
-
-requires jQuery 1.7+
-************************/
+/*!
+ * jquery-timepicker v1.11.10 - A jQuery timepicker plugin inspired by Google Calendar. It supports both mouse and keyboard navigation.
+ * Copyright (c) 2015 Jon Thornton - http://jonthornton.github.com/jquery-timepicker/
+ * License: MIT
+ */
 
 
 (function (factory) {
-	if (typeof define === 'function' && define.amd) {
+    if (typeof exports === "object" && exports &&
+        typeof module === "object" && module && module.exports === exports) {
+        // Browserify. Attach to jQuery module.
+        factory(require("jquery"));
+    } else if (typeof define === 'function' && define.amd) {
 		// AMD. Register as an anonymous module.
 		define(['jquery'], factory);
 	} else {
@@ -15,76 +18,113 @@ requires jQuery 1.7+
 		factory(jQuery);
 	}
 }(function ($) {
-	var _baseDate = _generateBaseDate();
 	var _ONE_DAY = 86400;
-	var _defaults =	{
-		className: null,
-		minTime: null,
-		maxTime: null,
-		durationTime: null,
-		step: 30,
-		showDuration: false,
-		timeFormat: 'g:ia',
-		scrollDefaultNow: false,
-		scrollDefaultTime: false,
-		selectOnBlur: false,
-		disableTouchKeyboard: true,
-		forceRoundTime: false,
-		appendTo: 'body',
-		disableTimeRanges: [],
-		closeOnWindowScroll: false,
-		disableTextInput: false
-	};
 	var _lang = {
+		am: 'am',
+		pm: 'pm',
+		AM: 'AM',
+		PM: 'PM',
 		decimal: '.',
 		mins: 'mins',
 		hr: 'hr',
 		hrs: 'hrs'
 	};
 
-	var methods =
-	{
+	var _DEFAULTS = {
+		appendTo: 'body',
+		className: null,
+		closeOnWindowScroll: false,
+		disableTextInput: false,
+		disableTimeRanges: [],
+		disableTouchKeyboard: false,
+		durationTime: null,
+		forceRoundTime: false,
+		maxTime: null,
+		minTime: null,
+		noneOption: false,
+		orientation: 'l',
+		roundingFunction: function(seconds, settings) {
+			if (seconds === null) {
+				return null;
+			} else if (typeof settings.step !== "number") {
+				// TODO: nearest fit irregular steps
+				return seconds;
+			} else {
+				var offset = seconds % (settings.step*60); // step is in minutes
+
+				var start = settings.minTime || 0;
+
+                // adjust offset by start mod step so that the offset is aligned not to 00:00 but to the start
+                offset -= start % (settings.step * 60);
+
+				if (offset >= settings.step*30) {
+					// if offset is larger than a half step, round up
+					seconds += (settings.step*60) - offset;
+				} else {
+					// round down
+					seconds -= offset;
+				}
+
+				return _moduloSeconds(seconds, settings);
+			}
+		},
+		scrollDefault: null,
+		selectOnBlur: false,
+		show2400: false,
+		showDuration: false,
+		showOn: ['click', 'focus'],
+		showOnFocus: true,
+		step: 30,
+		stopScrollPropagation: false,
+		timeFormat: 'g:ia',
+		typeaheadHighlight: true,
+		useSelect: false,
+		wrapHours: true
+	};
+
+	var methods = {
 		init: function(options)
 		{
 			return this.each(function()
 			{
 				var self = $(this);
 
-				// convert dropdowns to text input
-				if (self[0].tagName == 'SELECT') {
-					var attrs = { 'type': 'text', 'value': self.val() };
-					var raw_attrs = self[0].attributes;
-
-					for (var i=0; i < raw_attrs.length; i++) {
-						attrs[raw_attrs[i].nodeName] = raw_attrs[i].nodeValue;
+				// pick up settings from data attributes
+				var attributeOptions = [];
+				for (var key in _DEFAULTS) {
+					if (self.data(key))  {
+						attributeOptions[key] = self.data(key);
 					}
-
-					var input = $('<input />', attrs);
-					self.replaceWith(input);
-					self = input;
 				}
 
-				var settings = $.extend({}, _defaults);
-
-				if (options) {
-					settings = $.extend(settings, options);
-				}
+				var settings = $.extend({}, _DEFAULTS, options, attributeOptions);
 
 				if (settings.lang) {
 					_lang = $.extend(_lang, settings.lang);
 				}
 
 				settings = _parseSettings(settings);
-
 				self.data('timepicker-settings', settings);
-				self.prop('autocomplete', 'off');
-				self.on('click.timepicker focus.timepicker', methods.show);
-				self.on('change.timepicker', _formatValue);
-				self.on('keydown.timepicker', _keydownhandler);
-				self.on('keyup.timepicker', _keyuphandler);
 				self.addClass('ui-timepicker-input');
 
-				_formatValue.call(self.get(0));
+				if (settings.useSelect) {
+					_render(self);
+				} else {
+					self.prop('autocomplete', 'off');
+					if (settings.showOn) {
+						for (var i in settings.showOn) {
+							self.on(settings.showOn[i]+'.timepicker', methods.show);
+						}
+					}
+					self.on('change.timepicker', _formatValue);
+					self.on('keydown.timepicker', _keydownhandler);
+					self.on('keyup.timepicker', _keyuphandler);
+					if (settings.disableTextInput) {
+						self.on('keydown.timepicker', _disableTextInputHandler);
+					}
+
+					_formatValue.call(self.get(0), null, 'initial');
+				}
 			});
 		},
 
@@ -93,6 +133,15 @@ requires jQuery 1.7+
 			var self = $(this);
 			var settings = self.data('timepicker-settings');
 
+			if (e) {
+				e.preventDefault();
+			}
+
+			if (settings.useSelect) {
+				self.data('timepicker-list').focus();
+				return;
+			}
+
 			if (_hideKeyboard(self)) {
 				// block the keyboard on mobile devices
 				self.blur();
@@ -111,39 +160,60 @@ requires jQuery 1.7+
 				list = self.data('timepicker-list');
 			}
 
-			if (list.is(':visible')) {
+			if (_isVisible(list)) {
 				return;
 			}
 
+			self.data('ui-timepicker-value', self.val());
+			_setSelected(self, list);
+
 			// make sure other pickers are hidden
 			methods.hide();
 
+			// position the dropdown relative to the input
 			list.show();
+			var listOffset = {};
+
+			if (settings.orientation.match(/r/)) {
+				// right-align the dropdown
+				listOffset.left = self.offset().left + self.outerWidth() - list.outerWidth() + parseInt(list.css('marginLeft').replace('px', ''), 10);
+			} else {
+				// left-align the dropdown
+				listOffset.left = self.offset().left + parseInt(list.css('marginLeft').replace('px', ''), 10);
+			}
+
+			var verticalOrientation;
+			if (settings.orientation.match(/t/)) {
+				verticalOrientation = 't';
+			} else if (settings.orientation.match(/b/)) {
+				verticalOrientation = 'b';
+			} else if ((self.offset().top + self.outerHeight(true) + list.outerHeight()) > $(window).height() + $(window).scrollTop()) {
+				verticalOrientation = 't';
+			} else {
+				verticalOrientation = 'b';
+			}
 
-			if ((self.offset().top + self.outerHeight(true) + list.outerHeight()) > $(window).height() + $(window).scrollTop()) {
+			if (verticalOrientation == 't') {
 				// position the dropdown on top
-				list.offset({
-					'left': self.offset().left + parseInt(list.css('marginLeft').replace('px', ''), 10),
-					'top': self.offset().top - list.outerHeight() + parseInt(list.css('marginTop').replace('px', ''), 10)
-				});
+				list.addClass('ui-timepicker-positioned-top');
+				listOffset.top = self.offset().top - list.outerHeight() + parseInt(list.css('marginTop').replace('px', ''), 10);
 			} else {
 				// put it under the input
-				list.offset({
-					'left':self.offset().left + parseInt(list.css('marginLeft').replace('px', ''), 10),
-					'top': self.offset().top + self.outerHeight() + parseInt(list.css('marginTop').replace('px', ''), 10)
-				});
+				list.removeClass('ui-timepicker-positioned-top');
+				listOffset.top = self.offset().top + self.outerHeight() + parseInt(list.css('marginTop').replace('px', ''), 10);
 			}
 
+			list.offset(listOffset);
+
 			// position scrolling
 			var selected = list.find('.ui-timepicker-selected');
 
 			if (!selected.length) {
-				if (_getTimeValue(self)) {
-					selected = _findRow(self, list, _time2int(_getTimeValue(self)));
-				} else if (settings.scrollDefaultNow) {
-					selected = _findRow(self, list, _time2int(new Date()));
-				} else if (settings.scrollDefaultTime !== false) {
-					selected = _findRow(self, list, _time2int(settings.scrollDefaultTime));
+				var timeInt = _time2int(_getTimeValue(self));
+				if (timeInt !== null) {
+					selected = _findRow(self, list, timeInt);
+				} else if (settings.scrollDefault) {
+					selected = _findRow(self, list, settings.scrollDefault());
 				}
 			}
 
@@ -154,15 +224,42 @@ requires jQuery 1.7+
 				list.scrollTop(0);
 			}
 
-			_attachCloseHandler(settings);
+			// prevent scroll propagation
+			if(settings.stopScrollPropagation) {
+				$(document).on('wheel.ui-timepicker', '.ui-timepicker-wrapper', function(e){
+					e.preventDefault();
+					var currentScroll = $(this).scrollTop();
+					$(this).scrollTop(currentScroll + e.originalEvent.deltaY);
+				});
+			}
+
+			// attach close handlers
+			$(document).on('touchstart.ui-timepicker mousedown.ui-timepicker', _closeHandler);
+			$(window).on('resize.ui-timepicker', _closeHandler);
+			if (settings.closeOnWindowScroll) {
+				$(document).on('scroll.ui-timepicker', _closeHandler);
+			}
 
 			self.trigger('showTimepicker');
+
+			return this;
 		},
 
 		hide: function(e)
 		{
-			$('.ui-timepicker-wrapper:visible').each(function() {
+			var self = $(this);
+			var settings = self.data('timepicker-settings');
+
+			if (settings && settings.useSelect) {
+				self.blur();
+			}
+
+			$('.ui-timepicker-wrapper').each(function() {
 				var list = $(this);
+				if (!_isVisible(list)) {
+					return;
+				}
+
 				var self = list.data('timepicker-input');
 				var settings = self.data('timepicker-settings');
 
@@ -173,34 +270,42 @@ requires jQuery 1.7+
 				list.hide();
 				self.trigger('hideTimepicker');
 			});
+
+			return this;
 		},
 
 		option: function(key, value)
 		{
-			var self = this;
-			var settings = self.data('timepicker-settings');
-			var list = self.data('timepicker-list');
+			if (typeof key == 'string' && typeof value == 'undefined') {
+				return $(this).data('timepicker-settings')[key];
+			}
 
-			if (typeof key == 'object') {
-				settings = $.extend(settings, key);
+			return this.each(function(){
+				var self = $(this);
+				var settings = self.data('timepicker-settings');
+				var list = self.data('timepicker-list');
 
-			} else if (typeof key == 'string' && typeof value != 'undefined') {
-				settings[key] = value;
+				if (typeof key == 'object') {
+					settings = $.extend(settings, key);
+				} else if (typeof key == 'string') {
+					settings[key] = value;
+				}
 
-			} else if (typeof key == 'string') {
-				return settings[key];
-			}
+				settings = _parseSettings(settings);
 
-			settings = _parseSettings(settings);
+				self.data('timepicker-settings', settings);
 
-			self.data('timepicker-settings', settings);
+				_formatValue.call(self.get(0), {'type':'change'}, 'initial');
 
-			if (list) {
-				list.remove();
-				self.data('timepicker-list', false);
-			}
+				if (list) {
+					list.remove();
+					self.data('timepicker-list', false);
+				}
 
-			return self;
+				if (settings.useSelect) {
+					_render(self);
+				}
+			});
 		},
 
 		getSecondsFromMidnight: function()
@@ -211,23 +316,58 @@ requires jQuery 1.7+
 		getTime: function(relative_date)
 		{
 			var self = this;
+
+			var time_string = _getTimeValue(self);
+			if (!time_string) {
+				return null;
+			}
+
+			var offset = _time2int(time_string);
+			if (offset === null) {
+				return null;
+			}
+
 			if (!relative_date) {
 				relative_date = new Date();
 			}
 
-			relative_date.setHours(0, 0, 0, 0);
-			return new Date(relative_date.valueOf() + (_time2int(_getTimeValue(self))*1000));
+			// construct a Date from relative date, and offset's time
+			var time = new Date(relative_date);
+			time.setHours(offset / 3600);
+			time.setMinutes(offset % 3600 / 60);
+			time.setSeconds(offset % 60);
+			time.setMilliseconds(0);
+
+			return time;
+		},
+
+		isVisible: function() {
+			var self = this;
+			var list = self.data('timepicker-list');
+			return !!(list && _isVisible(list));
 		},
 
 		setTime: function(value)
 		{
 			var self = this;
-			var prettyTime = _int2time(_time2int(value), self.data('timepicker-settings').timeFormat);
+			var settings = self.data('timepicker-settings');
+
+			if (settings.forceRoundTime) {
+				var prettyTime = _roundAndFormatTime(_time2int(value), settings)
+			} else {
+				var prettyTime = _int2time(_time2int(value), settings);
+			}
+
+			if (value && prettyTime === null && settings.noneOption) {
+				prettyTime = value;
+			}
 
 			_setTimeValue(self, prettyTime);
 			if (self.data('timepicker-list')) {
 				_setSelected(self, self.data('timepicker-list'));
 			}
+
+			return this;
 		},
 
 		remove: function()
@@ -239,6 +379,7 @@ requires jQuery 1.7+
 				return;
 			}
 
+			var settings = self.data('timepicker-settings');
 			self.removeAttr('autocomplete', 'off');
 			self.removeClass('ui-timepicker-input');
 			self.removeData('timepicker-settings');
@@ -249,12 +390,24 @@ requires jQuery 1.7+
 				self.data('timepicker-list').remove();
 			}
 
+			if (settings.useSelect) {
+				self.show();
+			}
+
 			self.removeData('timepicker-list');
+
+			return this;
 		}
 	};
 
 	// private methods
 
+	function _isVisible(elem)
+	{
+		var el = elem[0];
+		return el.offsetWidth > 0 && el.offsetHeight > 0;
+	}
+
 	function _parseSettings(settings)
 	{
 		if (settings.minTime) {
@@ -269,6 +422,29 @@ requires jQuery 1.7+
 			settings.durationTime = _time2int(settings.durationTime);
 		}
 
+		if (settings.scrollDefault == 'now') {
+			settings.scrollDefault = function() {
+				return settings.roundingFunction(_time2int(new Date()), settings);
+			}
+		} else if (settings.scrollDefault && typeof settings.scrollDefault != 'function') {
+			var val = settings.scrollDefault;
+			settings.scrollDefault = function() {
+				return settings.roundingFunction(_time2int(val), settings);
+			}
+		} else if (settings.minTime) {
+			settings.scrollDefault = function() {
+				return settings.roundingFunction(settings.minTime, settings);
+			}
+		}
+
+		if ($.type(settings.timeFormat) === "string" && settings.timeFormat.match(/[gh]/)) {
+			settings._twelveHourTime = true;
+		}
+
+		if (settings.showOnFocus === false && settings.showOn.indexOf('focus') != -1) {
+			settings.showOn.splice(settings.showOn.indexOf('focus'), 1);
+		}
+
 		if (settings.disableTimeRanges.length > 0) {
 			// convert string times to integers
 			for (var i in settings.disableTimeRanges) {
@@ -282,6 +458,17 @@ requires jQuery 1.7+
 			settings.disableTimeRanges = settings.disableTimeRanges.sort(function(a, b){
 				return a[0] - b[0];
 			});
+
+			// merge any overlapping ranges
+			for (var i = settings.disableTimeRanges.length-1; i > 0; i--) {
+				if (settings.disableTimeRanges[i][0] <= settings.disableTimeRanges[i-1][1]) {
+					settings.disableTimeRanges[i-1] = [
+						Math.min(settings.disableTimeRanges[i][0], settings.disableTimeRanges[i-1][0]),
+						Math.max(settings.disableTimeRanges[i][1], settings.disableTimeRanges[i-1][1])
+					];
+					settings.disableTimeRanges.splice(i, 1);
+				}
+			}
 		}
 
 		return settings;
@@ -297,18 +484,42 @@ requires jQuery 1.7+
 			self.data('timepicker-list', false);
 		}
 
-		list = $('<ul />', { 'class': 'ui-timepicker-list' });
+		if (settings.useSelect) {
+			list = $('<select />', { 'class': 'ui-timepicker-select' });
+			var wrapped_list = list;
+		} else {
+			list = $('<ul />', { 'class': 'ui-timepicker-list' });
 
-		var wrapped_list = $('<div />', { 'class': 'ui-timepicker-wrapper', 'tabindex': -1 });
-		wrapped_list.css({'display':'none', 'position': 'absolute' }).append(list);
+			var wrapped_list = $('<div />', { 'class': 'ui-timepicker-wrapper', 'tabindex': -1 });
+			wrapped_list.css({'display':'none', 'position': 'absolute' }).append(list);
+		}
+
+		if (settings.noneOption) {
+			if (settings.noneOption === true) {
+				settings.noneOption = (settings.useSelect) ? 'Time...' : 'None';
+			}
 
+			if ($.isArray(settings.noneOption)) {
+				for (var i in settings.noneOption) {
+					if (parseInt(i, 10) == i){
+						var noneElement = _generateNoneElement(settings.noneOption[i], settings.useSelect);
+						list.append(noneElement);
+					}
+				}
+			} else {
+				var noneElement = _generateNoneElement(settings.noneOption, settings.useSelect);
+				list.append(noneElement);
+			}
+		}
 
 		if (settings.className) {
 			wrapped_list.addClass(settings.className);
 		}
 
 		if ((settings.minTime !== null || settings.durationTime !== null) && settings.showDuration) {
+			var stepval = typeof settings.step == 'function' ? 'function' : settings.step;
 			wrapped_list.addClass('ui-timepicker-with-duration');
+			wrapped_list.addClass('ui-timepicker-step-'+settings.step);
 		}
 
 		var durStart = settings.minTime;
@@ -320,27 +531,50 @@ requires jQuery 1.7+
 		var start = (settings.minTime !== null) ? settings.minTime : 0;
 		var end = (settings.maxTime !== null) ? settings.maxTime : (start + _ONE_DAY - 1);
 
-		if (end <= start) {
+		if (end < start) {
 			// make sure the end time is greater than start time, otherwise there will be no list to show
 			end += _ONE_DAY;
 		}
 
+		if (end === _ONE_DAY-1 && $.type(settings.timeFormat) === "string" && settings.show2400) {
+			// show a 24:00 option when using military time
+			end = _ONE_DAY;
+		}
+
 		var dr = settings.disableTimeRanges;
 		var drCur = 0;
 		var drLen = dr.length;
 
-		for (var i=start; i <= end; i += settings.step*60) {
-			var timeInt = i%_ONE_DAY;
+		var stepFunc = settings.step;
+		if (typeof stepFunc != 'function') {
+			stepFunc = function() {
+				return settings.step;
+			}
+		}
 
-			var row = $('<li />');
-			row.data('time', timeInt);
-			row.text(_int2time(timeInt, settings.timeFormat));
+		for (var i=start, j=0; i <= end; j++, i += stepFunc(j)*60) {
+			var timeInt = i;
+			var timeString = _int2time(timeInt, settings);
+
+			if (settings.useSelect) {
+				var row = $('<option />', { 'value': timeString });
+				row.text(timeString);
+			} else {
+				var row = $('<li />');
+				row.addClass((timeInt % _ONE_DAY) < (_ONE_DAY / 2) ? 'ui-timepicker-am' : 'ui-timepicker-pm');
+				row.data('time', _moduloSeconds(timeInt, settings));
+				row.text(timeString);
+			}
 
 			if ((settings.minTime !== null || settings.durationTime !== null) && settings.showDuration) {
-				var duration = $('<span />');
-				duration.addClass('ui-timepicker-duration');
-				duration.text(' ('+_int2duration(i - durStart)+')');
-				row.append(duration);
+				var durationString = _int2duration(i - durStart, settings.step);
+				if (settings.useSelect) {
+					row.text(row.text()+' ('+durationString+')');
+				} else {
+					var duration = $('<span />', { 'class': 'ui-timepicker-duration' });
+					duration.text(' ('+durationString+')');
+					row.append(duration);
+				}
 			}
 
 			if (drCur < drLen) {
@@ -349,7 +583,11 @@ requires jQuery 1.7+
 				}
 
 				if (dr[drCur] && timeInt >= dr[drCur][0] && timeInt < dr[drCur][1]) {
-					row.addClass('ui-timepicker-disabled');
+					if (settings.useSelect) {
+						row.prop('disabled', true);
+					} else {
+						row.addClass('ui-timepicker-disabled');
+					}
 				}
 			}
 
@@ -359,68 +597,118 @@ requires jQuery 1.7+
 		wrapped_list.data('timepicker-input', self);
 		self.data('timepicker-list', wrapped_list);
 
-		var appendTo = settings.appendTo;
-		if (typeof appendTo === 'string') {
-			appendTo = $(appendTo);
-		} else if (typeof appendTo === 'function') {
-			appendTo = appendTo(self);
-		}
-		appendTo.append(wrapped_list);
-		_setSelected(self, list);
-
-		list.on('click', 'li', function(e) {
+		if (settings.useSelect) {
+			if (self.val()) {
+				list.val(_roundAndFormatTime(_time2int(self.val()), settings));
+			}
 
-			// hack: temporarily disable the focus handler
-			// to deal with the fact that IE fires 'focus'
-			// events asynchronously
-			self.off('focus.timepicker');
-			self.on('focus.timepicker-ie-hack', function(){
-				self.off('focus.timepicker-ie-hack');
-				self.on('focus.timepicker', methods.show);
+			list.on('focus', function(){
+				$(this).data('timepicker-input').trigger('showTimepicker');
+			});
+			list.on('blur', function(){
+				$(this).data('timepicker-input').trigger('hideTimepicker');
+			});
+			list.on('change', function(){
+				_setTimeValue(self, $(this).val(), 'select');
 			});
 
-			if (!_hideKeyboard(self)) {
-				self[0].focus();
+			_setTimeValue(self, list.val(), 'initial');
+			self.hide().after(list);
+		} else {
+			var appendTo = settings.appendTo;
+			if (typeof appendTo === 'string') {
+				appendTo = $(appendTo);
+			} else if (typeof appendTo === 'function') {
+				appendTo = appendTo(self);
 			}
+			appendTo.append(wrapped_list);
+			_setSelected(self, list);
 
-			// make sure only the clicked row is selected
-			list.find('li').removeClass('ui-timepicker-selected');
-			$(this).addClass('ui-timepicker-selected');
+			list.on('mousedown click', 'li', function(e) {
 
-			if (_selectValue(self)) {
-				self.trigger('hideTimepicker');
-				wrapped_list.hide();
-			}
-		});
+				// hack: temporarily disable the focus handler
+				// to deal with the fact that IE fires 'focus'
+				// events asynchronously
+				self.off('focus.timepicker');
+				self.on('focus.timepicker-ie-hack', function(){
+					self.off('focus.timepicker-ie-hack');
+					self.on('focus.timepicker', methods.show);
+				});
+
+				if (!_hideKeyboard(self)) {
+					self[0].focus();
+				}
+
+				// make sure only the clicked row is selected
+				list.find('li').removeClass('ui-timepicker-selected');
+				$(this).addClass('ui-timepicker-selected');
+
+				if (_selectValue(self)) {
+					self.trigger('hideTimepicker');
+
+					list.on('mouseup.timepicker click.timepicker', 'li', function(e) {
+						list.off('mouseup.timepicker click.timepicker');
+						wrapped_list.hide();
+					});
+				}
+			});
+		}
 	}
 
-	function _generateBaseDate()
+	function _generateNoneElement(optionValue, useSelect)
 	{
-		return new Date(1970, 1, 1, 0, 0, 0);
+		var label, className, value;
+
+		if (typeof optionValue == 'object') {
+			label = optionValue.label;
+			className = optionValue.className;
+			value = optionValue.value;
+		} else if (typeof optionValue == 'string') {
+			label = optionValue;
+		} else {
+			$.error('Invalid noneOption value');
+		}
+
+		if (useSelect) {
+			return $('<option />', {
+					'value': value,
+					'class': className,
+					'text': label
+				});
+		} else {
+			return $('<li />', {
+					'class': className,
+					'text': label
+				}).data('time', String(value));
+		}
 	}
 
-	function _attachCloseHandler(settings)
+	function _roundAndFormatTime(seconds, settings)
 	{
-		if ('ontouchstart' in document) {
-			$('body').on('touchstart.ui-timepicker', _closeHandler);
-		} else {
-			$('body').on('mousedown.ui-timepicker', _closeHandler);
-			if (settings.closeOnWindowScroll) {
-				$(window).on('scroll.ui-timepicker', _closeHandler);
-			}
+		seconds = settings.roundingFunction(seconds, settings);
+		if (seconds !== null) {
+			return _int2time(seconds, settings);
 		}
 	}
 
 	// event handler to decide whether to close timepicker
 	function _closeHandler(e)
 	{
+		if (e.target == window) {
+			// mobile Chrome fires focus events against window for some reason
+			return;
+		}
+
 		var target = $(e.target);
-		var input = target.closest('.ui-timepicker-input');
-		if (input.length === 0 && target.closest('.ui-timepicker-wrapper').length === 0) {
-			methods.hide();
-			$('body').unbind('.ui-timepicker');
-			$(window).unbind('.ui-timepicker');
+
+		if (target.closest('.ui-timepicker-input').length || target.closest('.ui-timepicker-wrapper').length) {
+			// active timepicker was focused. ignore
+			return;
 		}
+
+		methods.hide();
+		$(document).unbind('.ui-timepicker');
+		$(window).unbind('.ui-timepicker');
 	}
 
 	function _hideKeyboard(self)
@@ -437,16 +725,16 @@ requires jQuery 1.7+
 
 		var settings = self.data('timepicker-settings');
 		var out = false;
-		var halfStep = settings.step*30;
+		var value = settings.roundingFunction(value, settings);
 
 		// loop through the menu items
 		list.find('li').each(function(i, obj) {
 			var jObj = $(obj);
+			if (typeof jObj.data('time') != 'number') {
+				return;
+			}
 
-			var offset = jObj.data('time') - value;
-
-			// check if the value is less than half a step from each row
-			if (Math.abs(offset) < halfStep || offset == halfStep) {
+			if (jObj.data('time') == value) {
 				out = jObj;
 				return false;
 			}
@@ -459,7 +747,7 @@ requires jQuery 1.7+
 	{
 		list.find('li').removeClass('ui-timepicker-selected');
 
-		var timeValue = _time2int(_getTimeValue(self));
+		var timeValue = _time2int(_getTimeValue(self), self.data('timepicker-settings'));
 		if (timeValue === null) {
 			return;
 		}
@@ -478,32 +766,30 @@ requires jQuery 1.7+
 	}
 
 
-	function _formatValue()
+	function _formatValue(e, origin)
 	{
-		if (this.value === '') {
+		if (this.value === '' || origin == 'timepicker') {
 			return;
 		}
 
 		var self = $(this);
-		var list = self.data('timepicker-list');
 
-		if (list && list.is(':visible')) {
+		if (self.is(':focus') && (!e || e.type != 'change')) {
 			return;
 		}
 
-		var seconds = _time2int(this.value);
+		var settings = self.data('timepicker-settings');
+		var seconds = _time2int(this.value, settings);
 
 		if (seconds === null) {
 			self.trigger('timeFormatError');
 			return;
 		}
 
-		var settings = self.data('timepicker-settings');
 		var rangeError = false;
 		// check that the time in within bounds
-		if (settings.minTime !== null && seconds < settings.minTime) {
-			rangeError = true;
-		} else if (settings.maxTime !== null && seconds > settings.maxTime) {
+		if ((settings.minTime !== null && settings.maxTime !== null)
+			&& (seconds < settings.minTime || seconds > settings.maxTime)) {
 			rangeError = true;
 		}
 
@@ -516,25 +802,21 @@ requires jQuery 1.7+
 		});
 
 		if (settings.forceRoundTime) {
-			var offset = seconds % (settings.step*60); // step is in minutes
-
-			if (offset >= settings.step*30) {
-				// if offset is larger than a half step, round up
-				seconds += (settings.step*60) - offset;
-			} else {
-				// round down
-				seconds -= offset;
+			var roundSeconds = settings.roundingFunction(seconds, settings);
+			if (roundSeconds != seconds) {
+				seconds = roundSeconds;
+				origin = null;
 			}
 		}
 
-		var prettyTime = _int2time(seconds, settings.timeFormat);
+		var prettyTime = _int2time(seconds, settings);
 
 		if (rangeError) {
-			if (_setTimeValue(self, prettyTime, 'error')) {
+			if (_setTimeValue(self, prettyTime, 'error') || e && e.type == 'change') {
 				self.trigger('timeRangeError');
 			}
 		} else {
-			_setTimeValue(self, prettyTime);
+			_setTimeValue(self, prettyTime, origin);
 		}
 	}
 
@@ -550,15 +832,20 @@ requires jQuery 1.7+
 
 	function _setTimeValue(self, value, source)
 	{
-		if (self.data('ui-timepicker-value') != value) {
-			self.data('ui-timepicker-value', value);
-			if (self.is('input')) {
-				self.val(value);
+		if (self.is('input')) {
+			self.val(value);
+
+			var settings = self.data('timepicker-settings');
+			if (settings.useSelect && source != 'select' && source != 'initial') {
+				self.data('timepicker-list').val(_roundAndFormatTime(_time2int(value), settings));
 			}
+		}
 
+		if (self.data('ui-timepicker-value') != value) {
+			self.data('ui-timepicker-value', value);
 			if (source == 'select') {
-				self.trigger('selectTime').trigger('changeTime').trigger('change');
-			} else if (source != 'error') {
+				self.trigger('selectTime').trigger('changeTime').trigger('change', 'timepicker');
+			} else if (['error', 'initial'].indexOf(source) == -1) {
 				self.trigger('changeTime');
 			}
 
@@ -569,6 +856,21 @@ requires jQuery 1.7+
 		}
 	}
 
+	/*
+	*  Filter freeform input
+	*/
+	function _disableTextInputHandler(e)
+	{
+		switch (e.keyCode) {
+			case 13: // return
+			case 9: //tab
+				return;
+
+			default:
+				e.preventDefault();
+		}
+	}
+
 	/*
 	*  Keyboard navigation via arrow keys
 	*/
@@ -577,13 +879,16 @@ requires jQuery 1.7+
 		var self = $(this);
 		var list = self.data('timepicker-list');
 
-		if (!list || !list.is(':visible')) {
+		if (!list || !_isVisible(list)) {
 			if (e.keyCode == 40) {
+				// show the list!
+				methods.show.call(self.get(0));
+				list = self.data('timepicker-list');
 				if (!_hideKeyboard(self)) {
 					self.focus();
 				}
 			} else {
-				return _screenInput(e, self);
+				return true;
 			}
 		}
 
@@ -591,6 +896,7 @@ requires jQuery 1.7+
 
 			case 13: // return
 				if (_selectValue(self)) {
+					_formatValue.call(self.get(0), {'type':'change'});
 					methods.hide.apply(this);
 				}
 
@@ -653,15 +959,10 @@ requires jQuery 1.7+
 				break;
 
 			default:
-				return _screenInput(e, self);
+				return true;
 		}
 	}
 
-	function _screenInput(e, self)
-	{
-		return !self.data('timepicker-settings').disableTextInput || e.ctrlKey || e.altKey || e.metaKey || (e.keyCode != 2 && e.keyCode < 46);
-	}
-
 	/*
 	*	Time typeahead
 	*/
@@ -669,8 +970,9 @@ requires jQuery 1.7+
 	{
 		var self = $(this);
 		var list = self.data('timepicker-list');
+		var settings = self.data('timepicker-settings');
 
-		if (!list || !list.is(':visible')) {
+		if (!list || !_isVisible(list) || settings.disableTextInput) {
 			return true;
 		}
 
@@ -702,12 +1004,12 @@ requires jQuery 1.7+
 			case 186: // colon
 			case 8: // backspace
 			case 46: // delete
-				_setSelected(self, list);
+				if (settings.typeaheadHighlight) {
+					_setSelected(self, list);
+				} else {
+					list.hide();
+				}
 				break;
-
-			default:
-				// list.find('li').removeClass('ui-timepicker-selected');
-				return;
 		}
 	}
 
@@ -726,63 +1028,85 @@ requires jQuery 1.7+
 		if (cursor.length) {
 			// selected value found
 			timeValue = cursor.data('time');
-
-		} else if (_getTimeValue(self)) {
-
-			// no selected value; fall back on input value
-			timeValue = _time2int(_getTimeValue(self));
-
-			_setSelected(self, list);
 		}
 
 		if (timeValue !== null) {
-			var timeString = _int2time(timeValue, settings.timeFormat);
-			_setTimeValue(self, timeString, 'select');
+			if (typeof timeValue != 'string') {
+				timeValue = _int2time(timeValue, settings);
+			}
+
+			_setTimeValue(self, timeValue, 'select');
 		}
 
-		//self.trigger('change').trigger('selectTime');
 		return true;
 	}
 
-	function _int2duration(seconds)
+	function _int2duration(seconds, step)
 	{
-		var minutes = Math.round(seconds/60);
-		var duration;
+		seconds = Math.abs(seconds);
+		var minutes = Math.round(seconds/60),
+			duration = [],
+			hours, mins;
 
-		if (Math.abs(minutes) < 60) {
+		if (minutes < 60) {
+			// Only show (x mins) under 1 hour
 			duration = [minutes, _lang.mins];
-		} else if (minutes == 60) {
-			duration = ['1', _lang.hr];
 		} else {
-			var hours = (minutes/60).toFixed(1);
-			if (_lang.decimal != '.') hours = hours.replace('.', _lang.decimal);
-			duration = [hours, _lang.hrs];
+			hours = Math.floor(minutes/60);
+			mins = minutes%60;
+
+			// Show decimal notation (eg: 1.5 hrs) for 30 minute steps
+			if (step == 30 && mins == 30) {
+				hours += _lang.decimal + 5;
+			}
+
+			duration.push(hours);
+			duration.push(hours == 1 ? _lang.hr : _lang.hrs);
+
+			// Show remainder minutes notation (eg: 1 hr 15 mins) for non-30 minute steps
+			// and only if there are remainder minutes to show
+			if (step != 30 && mins) {
+				duration.push(mins);
+				duration.push(_lang.mins);
+			}
 		}
 
 		return duration.join(' ');
 	}
 
-	function _int2time(seconds, format)
+	function _int2time(timeInt, settings)
 	{
-		if (seconds === null) {
-			return;
+		if (typeof timeInt != 'number') {
+			return null;
+		}
+
+		var seconds = parseInt(timeInt%60)
+			, minutes = parseInt((timeInt/60)%60)
+			, hours = parseInt((timeInt/(60*60))%24);
+
+		var time = new Date(1970, 0, 2, hours, minutes, seconds, 0);
+
+		if (isNaN(time.getTime())) {
+			return null;
+		}
+
+		if ($.type(settings.timeFormat) === "function") {
+			return settings.timeFormat(time);
 		}
 
-		var time = new Date(_baseDate.valueOf() + (seconds*1000));
 		var output = '';
 		var hour, code;
+		for (var i=0; i<settings.timeFormat.length; i++) {
 
-		for (var i=0; i<format.length; i++) {
-
-			code = format.charAt(i);
+			code = settings.timeFormat.charAt(i);
 			switch (code) {
 
 				case 'a':
-					output += (time.getHours() > 11) ? 'pm' : 'am';
+					output += (time.getHours() > 11) ? _lang.pm : _lang.am;
 					break;
 
 				case 'A':
-					output += (time.getHours() > 11) ? 'PM' : 'AM';
+					output += (time.getHours() > 11) ? _lang.PM : _lang.AM;
 					break;
 
 				case 'g':
@@ -791,7 +1115,9 @@ requires jQuery 1.7+
 					break;
 
 				case 'G':
-					output += time.getHours();
+					hour = time.getHours();
+					if (timeInt === _ONE_DAY) hour = settings.show2400 ? 24 : 0;
+					output += hour;
 					break;
 
 				case 'h':
@@ -806,6 +1132,7 @@ requires jQuery 1.7+
 
 				case 'H':
 					hour = time.getHours();
+					if (timeInt === _ONE_DAY) hour = settings.show2400 ? 24 : 0;
 					output += (hour > 9) ? hour : '0'+hour;
 					break;
 
@@ -819,6 +1146,12 @@ requires jQuery 1.7+
 					output += (seconds > 9) ? seconds : '0'+seconds;
 					break;
 
+				case '\\':
+					// escape character; add the next character and skip ahead
+					i++;
+					output += settings.timeFormat.charAt(i);
+					break;
+
 				default:
 					output += code;
 			}
@@ -827,63 +1160,97 @@ requires jQuery 1.7+
 		return output;
 	}
 
-	function _time2int(timeString)
+	function _time2int(timeString, settings)
 	{
-		if (timeString === '') return null;
-		if (!timeString || timeString+0 == timeString) return timeString;
-
-		if (typeof(timeString) == 'object') {
-			timeString = timeString.getHours()+':'+_pad2(timeString.getMinutes())+':'+_pad2(timeString.getSeconds());
+		if (timeString === '' || timeString === null) return null;
+		if (typeof timeString == 'object') {
+			return timeString.getHours()*3600 + timeString.getMinutes()*60 + timeString.getSeconds();
+		}
+		if (typeof timeString != 'string') {
+			return timeString;
 		}
 
-		timeString = timeString.toLowerCase();
+		timeString = timeString.toLowerCase().replace(/[\s\.]/g, '');
 
-		var d = new Date(0);
-		var time;
+		// if the last character is an "a" or "p", add the "m"
+		if (timeString.slice(-1) == 'a' || timeString.slice(-1) == 'p') {
+			timeString += 'm';
+		}
 
-		// try to parse time input
-		if (timeString.indexOf(":") === -1) {
-			// no colon present
-			time = timeString.match(/^([0-9]):?([0-5][0-9])?:?([0-5][0-9])?\s*([pa]?)m?$/);
+		var ampmRegex = '(' +
+			_lang.am.replace('.', '')+'|' +
+			_lang.pm.replace('.', '')+'|' +
+			_lang.AM.replace('.', '')+'|' +
+			_lang.PM.replace('.', '')+')?';
 
-			if (!time) {
-				time = timeString.match(/^([0-2][0-9]):?([0-5][0-9])?:?([0-5][0-9])?\s*([pa]?)m?$/);
-			}
-		} else {
-			time = timeString.match(/^(\d{1,2})(?::([0-5][0-9]))?(?::([0-5][0-9]))?\s*([pa]?)m?$/);
-		}
+		// try to parse time input
+		var pattern = new RegExp('^'+ampmRegex+'([0-9]?[0-9])\\W?([0-5][0-9])?\\W?([0-5][0-9])?'+ampmRegex+'$');
 
+		var time = timeString.match(pattern);
 		if (!time) {
 			return null;
 		}
 
-		var hour = parseInt(time[1]*1, 10);
-		var hours;
+		var hour = parseInt(time[2]*1, 10);
+		if (hour > 24) {
+			if (settings && settings.wrapHours === false) {
+				return null;
+			} else {
+				hour = hour % 24;
+			}
+		}
+
+		var ampm = time[1] || time[5];
+		var hours = hour;
+
+		if (hour <= 12 && ampm) {
+			var isPm = (ampm == _lang.pm || ampm == _lang.PM);
 
-		if (time[4]) {
 			if (hour == 12) {
-				hours = (time[4] == 'p') ? 12 : 0;
+				hours = isPm ? 12 : 0;
 			} else {
-				hours = (hour + (time[4] == 'p' ? 12 : 0));
+				hours = (hour + (isPm ? 12 : 0));
 			}
+		}
 
-		} else {
-			hours = hour;
+		var minutes = ( time[3]*1 || 0 );
+		var seconds = ( time[4]*1 || 0 );
+		var timeInt = hours*3600 + minutes*60 + seconds;
+
+		// if no am/pm provided, intelligently guess based on the scrollDefault
+		if (hour < 12 && !ampm && settings && settings._twelveHourTime && settings.scrollDefault) {
+			var delta = timeInt - settings.scrollDefault();
+			if (delta < 0 && delta >= _ONE_DAY / -2) {
+				timeInt = (timeInt + (_ONE_DAY / 2)) % _ONE_DAY;
+			}
 		}
 
-		var minutes = ( time[2]*1 || 0 );
-		var seconds = ( time[3]*1 || 0 );
-		return hours*3600 + minutes*60 + seconds;
+		return timeInt;
 	}
 
 	function _pad2(n) {
 		return ("0" + n).slice(-2);
 	}
 
+	function _moduloSeconds(seconds, settings) {
+		if (seconds == _ONE_DAY && settings.show2400) {
+			return seconds;
+		}
+
+		return seconds%_ONE_DAY;
+	}
+
 	// Plugin entry
 	$.fn.timepicker = function(method)
 	{
-		if(methods[method]) { return methods[method].apply(this, Array.prototype.slice.call(arguments, 1)); }
+		if (!this.length) return this;
+		if (methods[method]) {
+			// check if this element is a timepicker
+			if (!this.hasClass('ui-timepicker-input')) {
+				return this;
+			}
+			return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
+		}
 		else if(typeof method === "object" || !method) { return methods.init.apply(this, arguments); }
 		else { $.error("Method "+ method + " does not exist on jQuery.timepicker"); }
 	};
diff --git a/vendor/assets/stylesheets/jquery.timepicker.css b/vendor/assets/stylesheets/jquery.timepicker.css
index 87c7987..cd75f13 100755
--- a/vendor/assets/stylesheets/jquery.timepicker.css
+++ b/vendor/assets/stylesheets/jquery.timepicker.css
@@ -1,67 +1,72 @@
-.ui-timepicker-wrapper {
-	overflow-y: auto;
-	height: 150px;
-	width: 6.5em;
-	background: #fff;
-	border: 1px solid #ddd;
-	-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);
-	-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);
-	box-shadow:0 5px 10px rgba(0,0,0,0.2);
-	outline: none;
-	z-index: 10001;
-	margin: 0;
-}
-
-.ui-timepicker-wrapper.ui-timepicker-with-duration {
-	width: 11em;
-}
-
-.ui-timepicker-list {
-	margin: 0;
-	padding: 0;
-	list-style: none;
-}
-
-.ui-timepicker-duration {
-	margin-left: 5px; color: #888;
-}
-
-.ui-timepicker-list:hover .ui-timepicker-duration {
-	color: #888;
-}
-
-.ui-timepicker-list li {
-	padding: 3px 0 3px 5px;
-	cursor: pointer;
-	white-space: nowrap;
-	color: #000;
-	list-style: none;
-	margin: 0;
-}
-
-.ui-timepicker-list:hover .ui-timepicker-selected {
-	background: #fff; color: #000;
-}
-
-li.ui-timepicker-selected,
-.ui-timepicker-list li:hover,
-.ui-timepicker-list .ui-timepicker-selected:hover {
-	background: #1980EC; color: #fff;
-}
-
-li.ui-timepicker-selected .ui-timepicker-duration,
-.ui-timepicker-list li:hover .ui-timepicker-duration {
-	color: #ccc;
-}
-
-.ui-timepicker-list li.ui-timepicker-disabled,
-.ui-timepicker-list li.ui-timepicker-disabled:hover,
-.ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled {
-	color: #888;
-	cursor: default;
-}
-
-.ui-timepicker-list li.ui-timepicker-disabled:hover,
-.ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled {
-	background: #f2f2f2;
-}
+.ui-timepicker-wrapper {
+	overflow-y: auto;
+	height: 150px;
+	width: 6.5em;
+	background: #fff;
+	border: 1px solid #ddd;
+	-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);
+	-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);
+	box-shadow:0 5px 10px rgba(0,0,0,0.2);
+	outline: none;
+	z-index: 10001;
+	margin: 0;
+}
+
+.ui-timepicker-wrapper.ui-timepicker-with-duration {
+	width: 13em;
+}
+
+.ui-timepicker-wrapper.ui-timepicker-with-duration.ui-timepicker-step-30,
+.ui-timepicker-wrapper.ui-timepicker-with-duration.ui-timepicker-step-60 {
+	width: 11em;
+}
+
+.ui-timepicker-list {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+
+.ui-timepicker-duration {
+	margin-left: 5px; color: #888;
+}
+
+.ui-timepicker-list:hover .ui-timepicker-duration {
+	color: #888;
+}
+
+.ui-timepicker-list li {
+	padding: 3px 0 3px 5px;
+	cursor: pointer;
+	white-space: nowrap;
+	color: #000;
+	list-style: none;
+	margin: 0;
+}
+
+.ui-timepicker-list:hover .ui-timepicker-selected {
+	background: #fff; color: #000;
+}
+
+li.ui-timepicker-selected,
+.ui-timepicker-list li:hover,
+.ui-timepicker-list .ui-timepicker-selected:hover {
+	background: #1980EC; color: #fff;
+}
+
+li.ui-timepicker-selected .ui-timepicker-duration,
+.ui-timepicker-list li:hover .ui-timepicker-duration {
+	color: #ccc;
+}
+
+.ui-timepicker-list li.ui-timepicker-disabled,
+.ui-timepicker-list li.ui-timepicker-disabled:hover,
+.ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled {
+	color: #888;
+	cursor: default;
+}
+
+.ui-timepicker-list li.ui-timepicker-disabled:hover,
+.ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled {
+	background: #f2f2f2;
+}