cg-angular changes merged. Ticket #20
Merge remote-tracking branch 'origin/master'