[zanata/zanata-server] 4dae29: squash merge from master

[GitHub]

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

  Changed paths:
    A docs/images/project-people-manage-permissions.png
    M docs/images/project-translation-settings.png
    A docs/images/project-view-people.png
    M docs/images/project-view-versions.png
    M docs/release-notes.md
    M docs/user-guide/languages/language-team.md
    M docs/user-guide/projects/project-settings.md
    A docs/user-guide/projects/project-team.md
    M docs/user-guide/projects/project-view.md
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    R functional-test/src/main/java/org/zanata/page/projects/ProjectMaintainersPage.java
    A functional-test/src/main/java/org/zanata/page/projects/ProjectPeoplePage.java
    M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/DetailedTestSuite.java
    M mkdocs.yml
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HAccountOption.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    A zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
    A zanata-model/src/main/java/org/zanata/model/HProjectMember.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/LocaleRole.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    A zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    A zanata-model/src/main/java/org/zanata/model/ProjectRole.java
    A zanata-model/src/main/java/org/zanata/model/type/LocaleRoleDescriptor.java
    A zanata-model/src/main/java/org/zanata/model/type/LocaleRoleType.java
    A zanata-model/src/main/java/org/zanata/model/type/ProjectRoleDescriptor.java
    A zanata-model/src/main/java/org/zanata/model/type/ProjectRoleType.java
    M zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/DataPage.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectPagedListDataModel.java
    A zanata-war/src/main/java/org/zanata/action/ProjectPermissionDialog.java
    M zanata-war/src/main/java/org/zanata/action/SortingType.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    A zanata-war/src/main/java/org/zanata/dao/ProjectLocaleMemberDAO.java
    A zanata-war/src/main/java/org/zanata/dao/ProjectMemberDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/permission/PermissionGranter.java
    M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.8.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    A zanata-war/src/main/webapp/WEB-INF/layout/project/people-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/project/person-permissions-modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-general.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-translation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    A zanata-war/src/main/webapp/resources/script/jsf-ajax-viewstate-fix.js
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    A zanata-war/src/main/webapp/resources/zanata/person-permission-entry.xhtml
    A zanata-war/src/main/webapp/resources/zanata/person-tile.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/CopyTransTestData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/CopyVersionData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/DocumentsData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/MergeTranslationsData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TranslationMemoryData.dbunit.xml
    M zanata-war/src/test/resources/performance/GetTransUnitListTest.dbunit.xml

  Log Message:
  -----------
  squash merge from master

Conflicts:
	zanata-war/src/main/webapp/project/project.xhtml