Update with file from e-mail
Merge branch 'master' of https://github.com/gunchleoc/pokerth.git

Conflicts:
	ts/pokerth_gd.ts