cancel from datepicker
merging
Merge branch 'Dev3' of https://github.com/cgunarto/CAPSL into Dev3