Added date/time picking feature
Fixed Merge Conflict