remove unnecessary ie-specific code
Merge branch 'develop' of github.com:stevewithington/MuraCMS into develop
remove unnecessary ie-specific backport code
Revert "remove unnecessary ie-specific backport code"

This reverts commit 4126bda22b82e20bcdeb046e80197c661461c27f.
fix merge conflict
Merge branch 'develop' of github.com:stevewithington/MuraCMS into develop
adding form protect to HTML (data collection) forms
Merge pull request #1547 from ronnieduke/develop

fix rating class in galleries to match CSS
Merge pull request #1548 from ronnieduke/formprotect

adding form protect to HTML (data collection) forms
Merge branch 'develop' of git://github.com/blueriver/MuraCMS into develop
bug fix: email broadcaster unsubscribe link
Merge pull request #1550 from stevewithington/develop

bug fix: email broadcaster unsubscribe link
Slight tweak to listen to type and subtype

This change should fix the QoQ at the end. Before, the QoQ would come back with records that ignored the type and subtype declarations on the EOFB itself (.setType() and .setSubtype() appeared to be ignored). Here's an example of what reproduced the issue:

        <cfset feed = $.getBean('extendObjectFeedBean')> 
        <cfset feed.setSiteID( $.event('siteId') )> 
        <cfset feed.setType('Custom')>
        <cfset feed.setSubType('Equipment')>
        <cfset feed.setMaxItems(0)> 
        <cfdump var="#feed.getQuery()#">

Before the change produced this output:

http://cl.ly/image/0C0K2Z0f3d0l

Note how "Base" types are being returned despite the subtype being set on the bean.

After the change:

http://cl.ly/image/0542140p0E31
Adding missign data cleaning
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop
Removing tweak
Adding data sanitization
Possible fix for returning duplicate rows

In another issue, we were seeing duplicate rows coming back which corresponded to a row for each attribute defined for a given subtype. I'm not sure adding distinct here is ideal, but it seems to ensure we only get back one row per node of the subtype instead of a row per attribute.
Changing file paths to use /
Merge pull request #1552 from beamerweb/patch-14

Slight tweak to listen to type and subtype