GLS3D included
1
Merge branch 'origin/master'

Conflicts:
	Projects/FlashFramework/Console.as