[zanata/zanata-server] 5708a4: Merge branch 'integration/master' into rhbz1122776

[GitHub]

  Branch: refs/heads/rhbz1122776
  Home:   https://github.com/zanata/zanata-server
  Commit: 5708a4ce4c571cb4411a1c6851df55f368a2fbc3
      https://github.com/zanata/zanata-server/commit/5708a4ce4c571cb4411a1c6851df55f368a2fbc3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-10-24 (Fri, 24 Oct 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectTranslationTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java
    M zanata-model/src/main/java/org/zanata/model/WebHook.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml

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