adding jsonSerializer.cfc
Merge pull request #1481 from stevewithington/develop

adding jsonSerializer.cfc
Working on content intervals
Working on content intervals
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop
Working on content intervals
Working on content intervals
Working on content intervals
Working on content intervals
Working on content intervals
add displayInterval option: yearly
add calendar resource bundle key/values
Merge pull request #1482 from stevewithington/develop

add displayInterval option: yearly
Fixing issue with display options not being on the basic tab for content under calenders.
Manual Merge
Merge branch 'develop'