added angular and moment
merge conflicts