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

Conflicts:
	gui/common/common_styles.xml
Merge https://github.com/0ADMods/China

Conflicts:
	gui/common/common_styles.xml
deleting many unused files