Change dependency on Datetime to Dates
consolidate date functions
Merge branch 'quinnj-master'