convering dates
Merge branch 'finalweek' into dev