what is going on here!?
Merge branch 'master' of
https://github.com/cervantez/away3d-core-fp11.git

Conflicts:
	src/away3d/containers/View3D.as