Merge pull request #1 from GarageGames/development

Update to latest dev branch version
Updated ShapeVectorToy to use setPolyPrimitive instead of manual PolyList points

Users can now create a polygon with 3 to 20 vertices, or a circle.
Resolved Conflicts:
	engine/source/2d/scene/Scene.cc
Conflicts:
	engine/source/2d/core/SpriteBatch.cc
	engine/source/2d/sceneobject/CompositeSprite.cc
- WaveComposite now directly inherits from SpriteBatch and not CompositeSprite for demonstration.
Added a JointsToy WIP
Merge remote-tracking branch 'refs/remotes/upstream/development' into development
- Fixed DealsDamageBehavior::onCollision in the DeathBallToy. It was missing a parameter. Collision should be working again. Should the parameter list be changed again, this function needs to be updated.
- Added changes from pull request #32 (https://github.com/GarageGames/Torque2D/pull/32).
Merge pull request #44 from lilligreen/laboratory

ShapeVectorToy improvements
- SceneRenderState now refers to a SimObject as a render-host rather than a GuiControl.
- Minor formatting changes.
Merge remote-tracking branch 'refs/remotes/upstream/development' into development
Merge pull request #47 from doodaddy64/development

Development
onCollision version with parameters that are "backward compatible" with pre MIT.
- Fixed-up a recent bad merge and implemented stubs for missing functionality.  The baton has been passed back now... :)
- Implemented the stub "revolute joint" functions because they were so trivial.
- Some minor consistency changes to Taml.
- Some minor future compatibility changes to FileStream/Stream.  Really needs a good rework.
- Moved some TAML constants to a central location.
- Removed redundant declared asset entry from the AquariumToy.