merge master

Author: hanastasov

src/app/app.module.ts

@@ -111,16 +111,10 @@ import { GridFlexSampleComponent } from './grid-flex-layout/grid-flex.sample';
 import { GridEsfLoadOnDemandComponent } from './grid-esf-load-on-demand/grid-esf-load-on-demand.component';
 import { GridFilteringComponent } from './grid-filtering/grid-filtering.sample';
 import { GridExternalFilteringComponent } from './grid-external-filtering/grid-external-filtering.sample';
-<<<<<<< HEAD
 import { AboutComponent } from './grid-state/about.component';
 import { GridSaveStateComponent } from './grid-state/grid-state.component';
-=======
 import { GridMasterDetailSampleComponent } from './grid-master-detail/grid-master-detail.sample';
 
->>>>>>> d6c950b7be7f540e1ff3c167dd5f79301676e035
-
-
-
 const components = [
     AppComponent,
     AutocompletePipeContains,