using ng-switch instead of ng-if
Merge remote-tracking branch 'origin/master'