Merge pull request #1494 from stevewithington/develop

bug fix: defaultdate issue
abstract defaultDate to calendarUtil
Merge branch 'develop' into feature-userui