Add a date picker
Adds timepicker
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/custom.css
fix map height