added basic map link for facets with geolocation data
-facets will now always show on the map, even if they occur outside of the available geolocation time range
-a facet's highlighted line segment and accuracy circle are now hidden if the infowindow is closed
Renamed TimeSpanMap.java and TimeSpanSegment.java
Renamed TimeSpanMap.java and TimeSpanSegment.java
fixed a problem with passing ApiKey objects into GuestService APIs and modifying ApiKeyAttributes without first finding a fresh copy of the ApiKey object from JPA and operating on that
Merge branch 'development' of github.com:fluxtream/fluxtream-app into development
Updated channel configuration to use button dropdowns instead of msDropDown. This fixes the bug that caused channels to not be sortable
Merge remote-tracking branch 'origin/development' into dev
Merge branch 'bodymedia' of https://github.com/arwright/fluxtream-app into upstream_development2
Added TimezoneMap for use by BodyMedia updater timezone calculation
Improved the updateStartDate function to only call setApiKeyAttribute when the value changes rather than always setting it.
Modified getApiKeyAttribute, setApiKeyAttribute, and removeApiKey to deal gracefully with retrieving a null ApiKey from the entity manager since this is a normal condition when a connector is deleted while updating.
Modified flushUpdateWorkerTasks to work properly in the case where wipeOutHistory=false when a connector has failed during an initial history update and is currently rescheduled into the future.  Previous versions left such tasks in the table so that the corresponding connector/objectType would not update when the user requested a sync.  Also changed the behavior when wipeOutHistory is set to true, but that has not been properly tested.
Modified AbstractUpdater to no longer flush all data for a connector to the datastore after updateConnectorDataHistory completes.  Added explicit flush to updateConnectorHistory in FitBitTSUpdater since that was the one connector which was not properly sending initial history update data to the datastore already