First set of changes to s7 badge controller
Merge branch 'revamp' of https://github.com/angular/ng-darrrt-codelab into revamp
tweaks to code due to s7