Merge branch 'master' of https://github.com/Microsoft/featuretimeline

src/Common/redux/modules/OverrideIterations/overriddenIterationsSelector.ts

@@ -3,7 +3,7 @@ import { IEpicRoadmapState } from '../../../../EpicRoadmap/redux/contracts';
 export const
     OverriddenIterationSelector =
         (state: IEpicRoadmapState) =>
-            state.savedOverriddenIterations;
+            state.savedOverriddenIterations || {};
 
 
 export function getWorkItemOverrideIteration(state: IWorkItemOverrideIterationAwareState) {

src/FeatureTimeline/featuretimeline.html

@@ -19,7 +19,7 @@
                 paths: {
                     "react": "dist/react",
                     "react-dom": "dist/react-dom",
-                    "FeatureTimeline": "dist/featuretimeline"
+                    "FeatureTimeline": "dist/FeatureTimeline"
                 }
             }
         });