user ng-controller together with ng-view.
Merge remote-tracking branch 'origin/master'