repalced points callback with watch on points
added listener to scope.points so that points can be edited from an outside controller
Merge remote-tracking branch 'origin/master'