加geter
Merge branch 'master' of github.com:halleyxu/Starling-Framework

Conflicts:
	starling/bin/starling.swc