Victor Woeltjen 0036974c60 Merge remote-tracking branch 'github/master' into open450b
Merge latest from master branch to reconcile conflicts
for https://github.com/nasa/openmctweb/pull/469

Conflicts:
	platform/commonUI/general/bundle.json
2016-01-08 15:36:10 -08:00
..
2014-12-24 10:28:58 -08:00
2015-11-18 10:50:32 -08:00

This bundle is responsible for introducing a reusable infrastructure and set of APIs for using time-series data in Open MCT Web.