Merge branch 'master' of https://github.com/HannesEskebaek/zanata-server

 into show-reference-lang

Conflicts:
	pom.xml
	zanata-war/pom.xml
	zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
	zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenter.java
	zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java
	zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitChangeSourceLangPresenter.java
	zanata-war/src/main/java/org/zanata/webtrans/client/ui/LocaleListBox.java
	zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.java
	zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitChangeSourceLangView.java
	zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetLocaleListHandler.java
	zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTargetForLocaleHandler.java
	zanata-war/src/main/java/org/zanata/webtrans/shared/model/IdForLocale.java
	zanata-war/src/main/java/org/zanata/webtrans/shared/model/TextFlowTargetId.java