loc
Merge https://github.com/hlavko/hexx

Conflicts:
	src/shared/game/factories/locale.us.xml