Edited codes in AngularJS
Fix merge conflict in index.html
Edited ProjectVolunteer, Project and Project Category rest
Fixed merge conflicts
Edit index.html