guiji
Merge branch 'master' of https://github.com/GHunique/mYImageResource

Conflicts:
	CITYSOURCE/浙江/浙江.docx
	CITYSOURCE/浙江/浙江.xml