修改local.propertiess
update local.properties
hotfix
Merge branch 'master' into iss53
修改loca
再次修改loca
Merge branch 'hotfix'

Conflicts:
	local.properties