added angular-route
Merge remote-tracking branch 'origin/master'