dev
Merge branch 'master' of github.com:gauchoj/Starling-Framework

Conflicts:
	starling/src/starling/core/Starling.asde