branch-> angular support.
Merge remote-tracking branch 'origin/AngularSupport'