Update resourceBundleFactory.cfc

Adding Spanish (United States) to cf2java locale function
Adding error trap
Merge branch 'develop'
add queryAppend to utility.cfc
Merge pull request #1522 from stevewithington/develop

add queryAppend to utility.cfc
Adding siteid check to pulling request.contentRenderer into event objects
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop
Fixing reference to server scope
Merge branch 'develop'
Fixing reference to server scope
Merge branch 'develop'
Merge pull request #1518 from nsollecito/patch-6

Update resourceBundleFactory.cfc
Commenting out session methods until Railo issue is understood
Merge branch 'develop'
Adding rotateSession settings.ini.cfm attribute to be able to turn it on.  Can't make it default until railo issue is figured out
Merge branch 'develop'
Adding rotateSession settings.ini.cfm attribute to be able to turn it on.  Can't make it default until railo issue is figured out
Merge branch 'develop'
Updating rating selector to be more specific
Merge branch 'develop'