Applying patch with add / update controller fix from Rohit Kalkur

git-svn-id: https://svn.apache.org/repos/asf/rave/branches/angular@1520612 13f79535-47bb-0310-9956-ffa450edef68