[zanata/zanata-server] d1c777: Merge branch 'integration/master' into rhbz1147304

[GitHub]

  Branch: refs/heads/rhbz1147304
  Home:   https://github.com/zanata/zanata-server
  Commit: d1c777862eb6988e1c380d3f788889d55e0352bf
      https://github.com/zanata/zanata-server/commit/d1c777862eb6988e1c380d3f788889d55e0352bf
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

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