Merge remote branch 'upstream/master'

Conflicts:
	jquery-ui-timepicker-addon.js

Author: vhochstein

README

@@ -0,0 +1,12 @@
+jQuery Timepicker Addon
+=======================
+
+Use
+---
+- To use this plugin you must include jQuery and jQuery UI with datepicker and slider
+- Include timepicker-addon script
+- now use timepicker with $('#selector').datetimepicker() or $('#selector').timepicker()
+
+Contributing Code - Please Read!
+--------------------------------
+All code contributions and bug reports are much appreciated.  Please be sure to apply your fixes to the "dev" branch.

README.md

@@ -0,0 +1,6 @@
+.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+.ui-timepicker-div dl { text-align: left; }
+.ui-timepicker-div dl dt { height: 25px; }
+.ui-timepicker-div dl dd { margin: -25px 10px 10px 65px; }
+.ui-timepicker-div td { font-size: 90%; }
+.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }