[zanata/zanata-server] 8dfe03: Merge branch 'master' into ZNTA-1101-project-gloss...

[GitHub]

  Branch: refs/heads/ZNTA-1101-project-glossary
  Home:   https://github.com/zanata/zanata-server
  Commit: 8dfe031bb4745fc3a8f6e9b007113303fb982b3a
      https://github.com/zanata/zanata-server/commit/8dfe031bb4745fc3a8f6e9b007113303fb982b3a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M docs/release-notes.md
    M frontend/src/main/web/src/actions/profile.js
    M frontend/src/main/web/src/containers/Glossary/ImportModal.js
    M frontend/src/main/web/src/containers/Glossary/ViewHeader.js
    M frontend/src/main/web/src/containers/UserProfile/index.jsx
    M frontend/src/main/web/webpack.config.js
    M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M zanata-model/src/main/java/org/zanata/util/GlossaryUtil.java
    M zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-4.0.xml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/test/java/org/zanata/dao/GlossaryDAOTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/GlossaryFileServiceImplTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/GlossaryData.dbunit.xml

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-1101-project-glossary