Refactor and fixes on review
Merge branch 'project-page' of github.com:zanata/zanata-server into project-page