Fixing default csrf timeout issue
Fixing default csrf timeout issue
Manual Merge
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Fixing issue with cattrim not existing
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge pull request #1495 from stevewithington/develop

abstract defaultDate to calendarUtil
Rolling back version of fw1