some fixes
Merge branch 'angular_rewrite_upstream' into tags
Add the html and ctrl files needed for tag support