Add xgettext keyword support
Merge remote-tracking branch 'remotes/f1/master'

Conflicts:
	lib/jsxgettext.js