Fix the syntax of an ng-switch-when
Merge branch 'master' into pure