Commit of a unique technology, fix typo in Liu Bang description
Merge remote-tracking branch 'origin/master'

Conflicts:
	simulation/templates/structures/chin_blacksmith.xml