Merge branch 'master' of https://github.com/0ADMods/China

Signed-off-by: lionkanzen <lion.kanzen@gmail.com>
Merge branch 'master' of https://github.com/0ADMods/China

Conflicts:
	gui/common/common_styles.xml