try to fix conflicts
try to fix conflicts

mseemann/angular2-mdl-ext,kononenko-a-m/angular2-mdl-ext,kononenko-a-m/angular2-mdl-ext,mseemann/angular2-mdl-ext,mseemann/angular2-mdl-ext,kononenko-a-m/angular2-mdl-ext,kononenko-a-m/angular2-mdl-ext,mseemann/angular2-mdl-ext