Merge branch 'working-copy'

Added json feed for calendar events.
Added a general function that takes a query and a list of fields and
returns the results as a list of dictionaries suitable for passing
directly to the json function.
Added a sample view to show how the feed works.