master: Adding routes and angularjs