Switch back to the old HTTP server.
Begin reimplementing file upload handling.
Fix a possible null ref.
Initial commit
Merge remote-tracking branch 'refs/remotes/origin/http_server_switch' into VirtualSimulatorDeveloper

Resolved Conflicts:
	README.md
Merge remote-tracking branch 'refs/remotes/AuroraDevelopers/master' into VirtualSimulatorDeveloper

Resolved Conflicts:
	Aurora/Framework/Servers/HttpServer/BaseHttpServer.cs
	Aurora/Framework/Servers/HttpServer/Implementation/OSHttpRequest.cs
	Aurora/Framework/Servers/HttpServer/Implementation/OSHttpResponse.cs
	Aurora/Framework/Servers/HttpServer/Poll Service/PollServiceHttpRequest.cs
	Aurora/Framework/Servers/HttpServer/Poll Service/PollServiceRequestManager.cs
	Aurora/Framework/Servers/HttpServer/Poll Service/PollServiceWorkerThread.cs
	Aurora/Framework/Utils/MultipartForm.cs
	prebuild.xml
Merge remote-tracking branch 'refs/remotes/Async/master' into VirtualSimulatorDeveloper

Resolved Conflicts:
	Aurora/Framework/Servers/HttpServer/BaseHttpServer.cs
	Aurora/Framework/Servers/HttpServer/Implementation/OSHttpRequest.cs
	Aurora/Framework/Servers/HttpServer/Implementation/OSHttpResponse.cs
	Aurora/Framework/Servers/HttpServer/Poll Service/PollServiceHttpRequest.cs
	Aurora/Framework/Servers/HttpServer/Poll Service/PollServiceRequestManager.cs
	Aurora/Framework/Servers/HttpServer/Poll Service/PollServiceWorkerThread.cs
	Aurora/Services/DataService/Connectors/Local/LocalUserInfoConnector.cs
	prebuild.xml
Merge remote-tracking branch 'refs/remotes/Aurora-Sim/master' into VirtualSimulatorDeveloper

Resolved Conflicts:
	Aurora/Modules/Avatar/Inventory/LLClientInventory.cs
	Aurora/Services/SQLServices/InventoryService/InventoryService.cs
	OpenSim/Services/RobustCompat/XInventoryServicesConnector.cs
Merge remote-tracking branch 'refs/remotes/AsyncSimulator/master' into VirtualSimulatorDeveloper

Resolved Conflicts:
	Aurora/ClientStack/LLClientView.cs
	Aurora/Framework/Servers/HttpServer/BaseHttpServer.cs
	Aurora/Modules/Avatar/AuroraChat/AuroraChatModule.cs
	Aurora/Modules/Avatar/Inventory/LLClientInventory.cs
	Aurora/Modules/World/EntityTransfer/EntityTransferModule.cs
	Aurora/Modules/World/Startup/SimulationData/FileBasedSimulationData.cs
	Aurora/Services/SQLServices/InventoryService/InventoryService.cs
	bin/Configuration/Data/FileBased.ini.example
	prebuild.xml
Fixed Build
wrote a little note about using the HostName under [Network]. Just putting this here, since we don't have a working Wiki currently.
Merge remote-tracking branch 'refs/remotes/AuroraDevelopers/master' into VirtualSimulatorDeveloper
Cleaned up uneeded using directives in Framework
Small amount of cleanup in ODE physics plugin
Cleaned up some xml doc usings in physics
Make folder names longer for FileBased assets.
Cleanup some xml docs and minor code changes
Merge branch 'master' of git://github.com/aurora-sim/Async-Sim-Testing

Resolved Conflicts:
	Aurora/Framework/Servers/HttpServer/CSHTMLCreator.cs
Fix merge derp
Merge branch 'master' of https://github.com/LightDrake/Async-Sim-Testing