Merge Date and DateTime

Date and DateTime should just be Date with the option to add time, as changing these later on would result in breaking the model.