[zanata/zanata-server] e9bb6c: squash merged from master

[GitHub]

  Branch: refs/heads/replace-seam-taglib
  Home:   https://github.com/zanata/zanata-server
  Commit: e9bb6c17bb88a373ec7a9bb3a01c7594f8e168f6
      https://github.com/zanata/zanata-server/commit/e9bb6c17bb88a373ec7a9bb3a01c7594f8e168f6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    M .travis.yml
    M docs/user-guide/account/account-settings.md
    M docs/user-guide/client/client.md
    M docs/user-guide/documents/download-translated-documents.md
    M docs/user-guide/documents/upload-documents.md
    M docs/user-guide/glossary/delete-glossaries.md
    M docs/user-guide/glossary/upload-glossaries.md
    M docs/user-guide/project-maintainer-guide.md
    M docs/user-guide/projects/create-project.md
    M docs/user-guide/projects/gettext-example.md
    M docs/user-guide/projects/import-projects.md
    M docs/user-guide/projects/podir-example.md
    M docs/user-guide/projects/project-types.md
    M docs/user-guide/versions/create-version.md
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
    M zanata-war/src/main/webapp/resources/zanata/version-copy-action-loader.xhtml
    M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java

  Log Message:
  -----------
  squash merged from master

Conflicts:
	zanata-war/src/main/webapp/project/project.xhtml
	zanata-war/src/main/webapp/resources/zanata/version-copy-action-loader.xhtml