Merge branch 'dev-clear-button' into 'master'

Change datepicker clear button to now maintain date when button is clicked. Update tests.

See merge request !29