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'
Tweak to ensure proper date format
bug fix: poll results
Merge pull request #1490 from stevewithington/develop

bug fix: poll results
Adding allowopenfeeds settings.ini.cfm attribute and fixing ajax issue
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop
Merge branch 'develop'
Fixing logic to allow open feeds
update fw1 to v.2.5