Removing AngularJS template - not working as-is
Merge branch 'template-changes'