added date picker2
Merge branch 'finalweek' into dev