Working on CSRF framework
Adding error trap around setting content type
Fixing quick edit issue
bug fix: calendar issue
Merge pull request #1479 from stevewithington/develop

bug fix: calendar issue
Tweaking where plugin nav goes
Tweaking where plugin nav goes
Tweaking where plugin nav goes
Fixing issues with new csrf framework
Merge branch 'master' into develop
Fixing csrf issue
Fixing csrf issue
Reverting some ui changes
Merge branch 'develop'
Fixing MuraScope isuue
Merge branch 'develop'
Fixing MuraScope isuue
Fixing MuraScope isuue
Merge branch 'develop'
adding jsonSerializer.cfc