Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	huashan.xml