- angular changes
Merge origin/master