Merge remote-tracking branch 'origin/master' into gwt260

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/view/AttentionKeyShortcutView.java