allow for AWS S3 credentials to be defined in settings.ini.cfm
Merge pull request #1553 from stevewithington/develop

allow for AWS S3 credentials to be defined in settings.ini.cfm
fix IE form builder display issue
Merge branch 'develop' of github.com:stevewithington/MuraCMS into develop
Revert "allow for AWS S3 credentials to be defined in settings.ini.cfm"

This reverts commit 7a72ea179da2f30b857c2202dadc82739d46e5eb.
Revert "fix IE form builder display issue"

This reverts commit ed7d8dc595a5a621a8e9eaccf484931a6e773512.
bug fix: IE form builder display issue
Revert "Revert "allow for AWS S3 credentials to be defined in settings.ini.cfm""

This reverts commit 93833b588dd22b467dee63f609b17f7d9a45c773.
Merge pull request #1556 from stevewithington/develop

bug fix: IE form builder display issue
ignoring additional site
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop
Compiling for Steve's form builder fix
bug fix: javaSettingsLoadPaths will now allow for comma-separated list of libs
Merge pull request #1560 from stevewithington/develop

bug fix: javaSettingsLoadPaths will now allow for comma-separated list of libs
bug fix: feeds can now filter on extended attributes with datetime datatype
Merge pull request #1564 from stevewithington/develop

bug fix: feeds can now filter on extended attributes with datetime datatype
fix sort order of calendar events
Merge pull request #1566 from stevewithington/develop

fix sort order of calendar events
Merge branch 'master' of github.com:blueriver/MuraCMS