add: angular-moment added to the project
fix: merge conflicts