Merge branch 'master' into update-rest-url
Merge branch 'update-rest-url' of github.com:zanata/zanata-spa into update-rest-url