introduced datetimepicker
moved
moved back
moved back
introduced dateTimePickerRow
Merge remote-tracking branch 'upstream/master'

Conflicts:
	conf/messages.en