Fix url refactoring
Merge branch 'master' of github.com:zanata/zanata-spa

Conflicts:
	app/components/util/UrlService.js
Merge branch 'master' of github.com:zanata/zanata-spa