first go at displaying calendar data in the timeline; works, kinda, but couldn't figure out what 'top' and 'bottom' style attributes mean
fixed google calendar timeline display, need to figure out better click handling
make the rows a tad thicker
added runkeeper data in the timeline, need refinements
fixed pace computation
providing for the case where an connector was interrupted
fixed a bug that prevented closing the manage connectors dialog when the bodytrack app is open
hide events from hidden calendar as per user preferences
get the google calendar's connector's number of calendars to automatically reset the timeline's styles and handle changes in hidden calendars correctly as well
DateTimeFormatters need not be serialized by Jackson
fixed unnecessary (buggy) color override
Merge branch 'v0.9.0023_01-deploy-131020b' into upstream_development
improved the runkeeper connector: calories are now retrieved and graphable in the timeline; null-values are better handled and facet templating is greatly improved
Merge branch 'development' of github.com:fluxtream/fluxtream-app into development
Modified how times are handled in updateLocationData in response to crashes in FluxtreamCaptureUpdater when the time happened to be parsed as an integer.
Merge branch 'v0.9.0023_01-deploy-131020b' into upstream_development
Modified the time field used in creating the json to use a double rather than an int.  Up until this point sub-second timing data was getting thrown away when facets were written to the datastore.
Modified capitalization of the runkeeper datastore device name to be lowercase as part of an effort to make the runkeeper settings show up in the manage connectors.  This pointed out a problem in ManageConnectors.js where it would only match up datastore device names with connectors if the device names matched exactly with the name field in the Connector table.  This needs to be generalized in the future.  For the short term I added a hack where it will also accept the connectorName field, which is typically lowercase.  This is necessary (I think) to make it possible for a connector to have both timerange channels (which have to match channelName based on the example of 'moves' and 'lastfm') and datastore channels.
fixed loss of precision bug linked to the use of JSONObject et al. by providing a fixed up json-lib jar (v2.4.1)
last commit was essentially missing a dependency for the static initialization of JSONUtils