Remove angular-route
Merge branch 'final'