bodytrack channels now pop in and out when connectors are added/deleted
Merge remote-tracking branch 'origin/development' into dev
modified channel names to show ellipsis when the overflow happens
Runkeeper data with values of 0 are now hidden from the user
disabled the trash button next to the fluxtream_capture connector in manage connectors
Disabled UI access to year view
Merge remote-tracking branch 'origin/development' into development
fixed a bug that caused timeline tab to not add any channels if bodytrack app was opened first
Modified to specifically check 'flx' database for deciding whether to add TimeStorage columns
fixed bug where pages on listTab will show an extra even on pages > 1
Attempted to increase stability of grapher initialization
Merge remote-tracking branch 'origin/development' into development
Merge remote-tracking branch 'origin/development' into dev
Modified cleanup SQL to properly preserve manual checkin locations.
Flickr now has a defaultChannel set for timeline tab
Connector toggles should show up when new connectors are added properly now!
Modified Zeo sleep graph to align start time to the previous 5 minute boundary.  The datastore directories for existing zeo instances (dev.kvs/<guestId>/Zeo) should be moved aside and the zeo data re-exported to the datastore.  This can be done with curl:   curl -u <adminUsername>:<passwd> -X POST 'http://localhost:8080/api/bodytrack/uploadHistory?username=<guestUsername>&connectorName=zeo'
Merge branch 'development' of https://github.com/fluxtream/fluxtream-app into upstream_development
added new withings scale heart rate facet and channel
fixed heartPulse being transient and added the new facet's table DDL - also: set hbm2ddl.auto to 'none' again in applicationContext.xml (important)