Merge branch 'dev-kelly' into dev
catch opensense date errors
Merge branch 'dev' into dev-kelly