CAP-117 Adding backbone implementation
CAP-118 Upgrade to Spring 3.1.1
NOJIRA:  Fix the way the 'days' paramter gets passed to the Ajax controller from JS;  it was passing always the previous value instead of the newly-clicked one
NOJIRA Fixing value-type of cache map
Merging recent trunk changes
NOJIRA:  Bump ical4j to version 1.0.3
NOJIRA:  Document the disablePreferences setting;  also make sure guests cannot access preferences in the desktop view (make it same as mobile)
CAP-120:  Allow admins to limit which predefined calenders may appear within the CalendarSet for portlet publication
CAP-121:  Update & fix the calDAV adaptor

Squashed commit of the following:

commit 40dddef448f6a31d5eb918393f62f7f6c0aac7cb
Author: James Wennmacher <jwennmacher@unicon.net>
Date:   Thu Oct 11 12:04:49 2012 -0700

    CAP-116 commented out calDAV adapter for general case

commit 7467b23f97c36539062b453d37bd856f04949b55
Merge: b9c2158 2cfccda
Author: James Wennmacher <jwennmacher@unicon.net>
Date:   Thu Oct 11 11:55:05 2012 -0700

    Merge remote-tracking branch 'upstream/master' into CAP-116

commit b9c2158d4de136b8c5264ee53b550355985fa372
Author: James Wennmacher <jwennmacher@unicon.net>
Date:   Thu Oct 11 11:51:59 2012 -0700

    CAP-116 calDAV adapter that can work with google-hosted accounts

commit 97d9dac6c9e245dc42c5730876762758de986504
Author: James Wennmacher <jwennmacher@unicon.net>
Date:   Wed Oct 10 14:16:36 2012 -0700

    CAP-116 partially-working version using render url and escapeXml
Merge pull request #1 from drewwills/CAP-120

CAP-120:  Allow admins to limit which predefined calenders may appear wi...
CAP-122 Adapters use correct key value when retrieving calendar from cache
CAP-122 Dao sets cache entry's time to live for timezone-adjusted calendar event set based on expiration time of data from adapter
CAP-122 Added debug statements to make testing easier
CAP-122 Fixed caching to handle http iCal's 2-stage cache in the adapter
CAP-122 Fixed caching to handle http iCal's 2-stage cache in the adapter
CAP-122 Added debug statements, allow for infinite timeToLive on API for consistency with ehCache, though we won't use it in practice
CAP-124 Export calendar feed as an iCal file
CAP-125 Course Calendar portlet implementation
CAP-125 Corrected iCal calendar product name
CAP-124 Saving partially working version