bug fix: issue #1486
Merge branch 'develop' of git://github.com/blueriver/MuraCMS into develop
Adding height constraint to model dropdown
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop
Fixing issue with cattrim not existing
bug fix: dsp_adZone now uses correct syntax for swfobject 2.2
Merge pull request #1487 from stevewithington/develop

bug fix: issue #1486
Tweaking module nav
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop
Merge branch 'develop'