[zanata/zanata-server] 360b80: Merge branch 'master' into ZNTA-938

[GitHub]

  Branch: refs/heads/ZNTA-938
  Home:   https://github.com/zanata/zanata-server
  Commit: 360b807def3996a72f98274ce5679a38e57e78cf
      https://github.com/zanata/zanata-server/commit/360b807def3996a72f98274ce5679a38e57e78cf
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M docs/release-notes.md
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectWebHooksTab.java
    M zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-4.0.xml
    A zanata-war/src/main/resources/messages_anp.properties
    M zanata-war/src/main/resources/messages_bg.properties
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_ca.properties
    M zanata-war/src/main/resources/messages_cs.properties
    M zanata-war/src/main/resources/messages_de.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_eo.properties
    A zanata-war/src/main/resources/messages_es_AR.properties
    M zanata-war/src/main/resources/messages_es_ES.properties
    M zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_gu.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_ko.properties
    A zanata-war/src/main/resources/messages_me_ME.properties
    A zanata-war/src/main/resources/messages_mk.properties
    M zanata-war/src/main/resources/messages_nl.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_ru.properties
    M zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_Hans_CN.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join_modal.xhtml

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-938