* Fix typing mistake
Merge remote-tracking branch 'upstream/master'
Fix a bug with locking the wrong list. #1076.
Make the cache ini files be example files, not just plain .ini files. #1078.
Merge remote-tracking branch 'upstream/master'
Update README.md

Changed the Documentation to a seperate folder
* Changed the Documentation for Aurora to be in a separate folder

* Work in Progress:

 - Write Standalone instructions
 - Write Grid instructions
Merge pull request #136 from fly-man-/master

WIP: Documentation Update
Aurora Server has a different logfile, seems I missed this one when I renamed it
Merge pull request #137 from fly-man-/master

Aurora.Server logfile named incorrectly
Attempt at fixing 1085.
Merge branch 'master' of github.com:aurora-sim/Aurora-Sim
Fix a bunch of places that were not properly flushing the group permission cache (#1047).
Add "edit scale" console command feature (#1086).
Attempted fix for not setting the parcelsearch table's UserLocation properly (#1080).
Fix setting of the offline flag in the grid service. (PROTOCOL CHANGE).
Merge branch 'master' of git://github.com/aurora-sim/Aurora-Sim

Conflicts:
	Aurora/Physics/AuroraOpenDynamicsEngine/AODEPrim.cs
	bin/AuroraServerConfiguration/AssetCache/CenomeCache.ini.example
	bin/Configuration/Modules/AssetCache/FlotsamCache.ini.example