Merge branch 'origin/development'

Conflicts:
	.gitignore
	engine/compilers/VisualStudio 2010/Torque 2D.vcxproj
	engine/compilers/VisualStudio 2010/Torque 2D.vcxproj.filters
	engine/compilers/Xcode/Torque2D.xcodeproj/xcshareddata/xcschemes/Torque2D.xcscheme
	engine/source/2d/assets/AnimationAsset_ScriptBinding.h
	engine/source/2d/assets/ImageAsset.cc
	engine/source/2d/assets/ImageAsset.h
	engine/source/2d/assets/ParticleAssetField.cc
	engine/source/2d/core/ImageFrameProvider.cc
	engine/source/2d/core/SpriteBatch.cc
	engine/source/2d/core/SpriteBatch.h
	engine/source/2d/core/SpriteBatchItem.cc
	engine/source/2d/core/SpriteBatchItem.h
	engine/source/2d/core/Vector2.h
	engine/source/2d/core/Vector2_ScriptBinding.h
	engine/source/2d/gui/SceneWindow.cc
	engine/source/2d/gui/guiSpriteCtrl.cc
	engine/source/2d/gui/guiSpriteCtrl.h
	engine/source/2d/gui/guiSpriteCtrl_ScriptBindings.h
	engine/source/2d/scene/DebugStats.h
	engine/source/2d/scene/Scene.cc
	engine/source/2d/scene/Scene.h
	engine/source/2d/scene/SceneRenderState.h
	engine/source/2d/scene/Scene_ScriptBinding.h
	engine/source/2d/sceneobject/CompositeSprite.cc
	engine/source/2d/sceneobject/CompositeSprite.h
	engine/source/2d/sceneobject/SceneObject.cc
	engine/source/2d/sceneobject/SceneObject.h
	engine/source/2d/sceneobject/SceneObject_ScriptBinding.h
	engine/source/assets/assetFieldTypes.h
	engine/source/assets/assetManager.cc
	engine/source/assets/tamlAssetDeclaredUpdateVisitor.h
	engine/source/assets/tamlAssetDeclaredVisitor.h
	engine/source/assets/tamlAssetReferencedUpdateVisitor.h
	engine/source/assets/tamlAssetReferencedVisitor.h
	engine/source/audio/audio.cc
	engine/source/audio/audio_ScriptBinding.cc
	engine/source/component/behaviors/behaviorComponent.cpp
	engine/source/component/behaviors/behaviorComponent.h
	engine/source/console/console.cc
	engine/source/console/consoleFunctions.cc
	engine/source/console/metaScripting_ScriptBinding.cc
	engine/source/game/defaultGame.cc
	engine/source/game/version.cc
	engine/source/graphics/TextureManager.cc
	engine/source/graphics/TextureManager_ScriptBinding.h
	engine/source/graphics/dgl.cc
	engine/source/gui/containers/guiGridCtrl.cc
	engine/source/gui/guiCanvas.cc
	engine/source/gui/guiCanvas_ScriptBinding.h
	engine/source/gui/guiControl.cc
	engine/source/gui/guiControl_ScriptBinding.h
	engine/source/input/actionMap.cc
	engine/source/math/math_ScriptBinding.cc
	engine/source/persistence/taml/binary/tamlBinaryReader.h
	engine/source/persistence/taml/binary/tamlBinaryWriter.h
	engine/source/persistence/taml/taml.cc
	engine/source/persistence/taml/taml.h
	engine/source/persistence/taml/tamlCallbacks.h
	engine/source/persistence/taml/tamlWriteNode.h
	engine/source/persistence/taml/tamlXmlVisitor.h
	engine/source/persistence/taml/taml_ScriptBinding.h
	engine/source/persistence/taml/xml/tamlXmlParser.cc
	engine/source/persistence/taml/xml/tamlXmlReader.h
	engine/source/persistence/taml/xml/tamlXmlWriter.h
	engine/source/platform/platformAL.h
	engine/source/platform/platformAssert.cc
	engine/source/platformAndroid/AndroidAlerts.h
	engine/source/platformOSX/osxString.mm
	engine/source/platformiOS/iOSStrings.mm
	engine/source/sim/simObject.cc
	engine/source/sim/simObject.h
	engine/source/sim/simSet.h
	engine/source/string/stringTable.cc
	modules/AppCore/1/scripts/canvas.cs
	modules/AppCore/1/scripts/defaultPreferences.cs
	modules/CompoundObjectsToy/1/main.cs
	modules/DeathBallToy/1/main.cs
	modules/RotateToToy/1/main.cs