[zanata/zanata-server] c9942e: Merge entityType with TranslationEntityType

[GitHub]

  Branch: refs/heads/release-rhbz1235070
  Home:   https://github.com/zanata/zanata-server
  Commit: c9942efed283e8ac0c3c82cbaebc7732ae886ac5
      https://github.com/zanata/zanata-server/commit/c9942efed283e8ac0c3c82cbaebc7732ae886ac5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M zanata-model/src/main/java/org/zanata/model/ITextFlowTargetHistory.java
    M zanata-model/src/main/java/org/zanata/model/IsEntityWithType.java
    M zanata-model/src/main/java/org/zanata/model/type/EntityType.java
    A zanata-model/src/main/java/org/zanata/model/type/EntityTypeType.java
    A zanata-model/src/main/java/org/zanata/model/type/EntityTypeTypeDescriptor.java
    R zanata-model/src/main/java/org/zanata/model/type/TranslationEntityType.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/TranslationUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/delete_confirmation_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/util/TranslationUtilTest.java

  Log Message:
  -----------
  Merge entityType with TranslationEntityType