[zanata/zanata-server] 735b66: Merge branch 'release' into integration/master

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 735b6666641495262fc216e5541fdaf6219bd8e0
      https://github.com/zanata/zanata-server/commit/735b6666641495262fc216e5541fdaf6219bd8e0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
    M zanata-war/src/main/webapp/language/home.xhtml

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

Conflicts:
	zanata-war/src/main/java/org/zanata/action/SupportedLanguageAction.java
	zanata-war/src/main/webapp/language/home.xhtml