combine datepicker&timepicker
merge master
Merge branch 'dev' into datepicker

Conflicts:
	docs/templates/datepicker.jade
datepicker default active
merge label and text in docs