add date/time setting
Merge branch 'iyjung' into gylee
ok/delete button
Merge branch 'iyjung' into gylee
modify merged