edit functionality done
resolve conflicts
Merge branch 'master' of https://github.com/mohitvirmani/UseAngularInGrails

merge plz