abstract defaultDate to calendarUtil
Merge pull request #1495 from stevewithington/develop

abstract defaultDate to calendarUtil
Rolling back version of fw1
Merge branch 'develop'