[zanata/zanata-server] dffc9a: Merge branch 'integration/master' into rhbz1184299

[GitHub]

  Branch: refs/heads/rhbz1184299
  Home:   https://github.com/zanata/zanata-server
  Commit: dffc9aefc4f0aae823effb76e2ac15ed19f1fb41
      https://github.com/zanata/zanata-server/commit/dffc9aefc4f0aae823effb76e2ac15ed19f1fb41
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-30 (Fri, 30 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/app/index.html
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml

  Log Message:
  -----------
  Merge branch 'integration/master' into rhbz1184299