Angular

merging angular models with master branch