silence init order warnings
Merge branch 'master' of github.com:fluffyfreak/pioneer into new4BaySpaceStation

Conflicts:
	data/stations/ground_1.lua
	data/stations/ground_2.lua
	data/stations/ground_3.lua
	data/stations/nice.lua
	src/ModelBase.h
	src/SpaceStation.cpp
	src/scenegraph/Loader.cpp
	win32/vc2012/modelviewer.vcxproj
	win32/vc2012/modelviewer.vcxproj.filters
Disable all but my 8bya testing station and the ground_station_4
Even that's fucked.
Remove the VectorFont file references
Merge remote-tracking branch 'robn/ui-lua-multilinetext'
Correctly initialise the Body class
Fixup the return value from the position and orientation.
Merge branch 'master' of github.com:fluffyfreak/pioneer into new4BaySpaceStation
Merge remote-tracking branch 'robn/lua-cleanup-1'
Correctly initialise the Body class.
Merge remote-tracking branch 'fluffyfreak/BodyInitialisation'
Add a collision mesh separate to the rendered mesh to get collision working.
add Lua API Player:{Get,Set}HyperspaceTarget. closes #2027

This is a temporary solution. When more of the UI has been moved into Lua,
this will no longer be necessary.
Merge remote-tracking branch 'johnbartholomew/lua-sethyperspacetarget'
Fix crash upon refueling.

self:Stats() should be self:GetStats()
Update VS2010 project
Merge remote-tracking branch 'chronothan/patch-1'
Merge remote-tracking branch 'shadmar/Kanara_Interceptor' into kanara-interceptor
recase texture files to match .model
Merge branch 'master' into Kanara_Interceptor