Merge branch 'dev' of http://47.96.66.225:10080/chelios/xsdmx-CocosCreator into dev

# Conflicts:
#	assets/resources/prefab/map/map1.prefab
#	local/local.json