Format Dates
Merge branch 'weekly_note' into dev
Format dates