Fixed conflicts in bower.json and cleanup the regex for js route and added cdn variable