Update VS2010
update changelog
Add DerpyHooves to AUTHORS
Added some logging and errors/warnings.
Also removed the numDockingPorts from the Lua and instead calculate it from the number of docking bays actually defined.
clean up station docking stage/docking node checks
Merge branch 'BetterStationLogging'
Update to latest version of JobSwarm from TestHACD project.
Avoid virtual setters during Load/initialisation. Fixes #2221.

Load/Init should only be setting up state, whereas virtual setters are
often overriden in derived classes to trigger things on particular state
changes (e.g., put a message in the ship console when the ship alert state
changes). Load/Init is not a state change, because there's no (valid)
previous state.
Merge pull request #2223 from johnbartholomew/issue-2221

Avoid virtual setters during Load/initialisation
set ship type through SetShipId to include property update

fixes #2225
Merge remote-tracking branch 'johnbartholomew/issue-2225'
Merge branch 'master' into threaded-terrain
update autotools build for SDL version
fix up cpu core selection ui
Merge branch 'threaded-terrain' of https://github.com/robn/pioneer into JustLookingAgain

Conflicts:
	contrib/jobswarm/ThreadConfig.cpp
	contrib/jobswarm/ThreadConfig.h
Unify line endings and renamea token identified as missing.