Fix merging conflicts
Merge branch 'fredcorn-DatetimePicker' into development