Merge remote branch 'origin/master' into gwt260

Conflicts:
	pom.xml
	zanata-war/pom.xml
	zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
	zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java
	zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java