ngroute -> ui.router
Merge remote-tracking branch 'origin/master'