converted to angular
Merge branch 'staging'