Merge remote-tracking branch 'upstream/master'

Conflicts:
	OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	OpenSim/Framework/Console/ConsoleUtil.cs
	OpenSim/Region/Application/OpenSim.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
	OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
	OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
	OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
	OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs
	OpenSim/Region/Physics/BulletSPlugin/BS6DofConstraint.cs
	OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
	OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs
	OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
	OpenSim/Region/Physics/BulletSPlugin/BSHingeConstraint.cs
	OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
	OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
	OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
	OpenSim/Region/Physics/BulletSPlugin/BSMaterials.cs
	OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
	OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
	OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs
	OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
	OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
	OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
	OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
	OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs
	OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
	OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
	OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
	OpenSim/Region/Physics/Manager/PhysicsActor.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs
	OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
	OpenSim/Region/UserStatistics/WebStatsModule.cs
	OpenSim/Server/Base/ServicesServerBase.cs
	OpenSim/Server/ServerMain.cs
	bin/OpenMetaverse.dll.config
	bin/OpenSim.ini.example
	bin/OpenSimDefaults.ini
	bin/Robust.HG.ini.example
	bin/Robust.ini.example
	bin/config-include/GridCommon.ini.example
	bin/lib32/BulletSim.dll
	bin/lib32/libBulletSim.so
	bin/lib64/BulletSim.dll
	bin/lib64/libBulletSim.so
Merge branch 'master' of https://github.com/ffoliveira/opensimulator

Conflicts:
	.gitignore
	OpenSim/Data/IXGroupData.cs
	OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs