gravwell generators online.
Add TFTD article outline
fix non-square pixels option
add battlescape background colour
comments
Force dead unit recovery to use the unit's corpseGeo instead of the battle corpse item (might fix mod alien recoveries).
depth slider for the new battle menu
add helmets underwater
fix r-click cancel stuff
Merge branch 'master' of https://github.com/SupSuper/OpenXcom into oXc_kL

Conflicts:
	Makefile.am
	src/Battlescape/BattlescapeState.cpp
	src/Battlescape/DebriefingState.cpp
	src/Battlescape/Map.cpp
	src/Battlescape/UnitSprite.cpp
	src/Battlescape/UnitSprite.h
	src/CMakeLists.txt
	src/Engine/Screen.cpp
	src/Engine/Surface.cpp
	src/Engine/Surface.h
	src/Geoscape/GeoscapeState.cpp
	src/Menu/NewBattleState.cpp
	src/Menu/NewBattleState.h
	src/OpenXcom.2010.vcxproj
	src/OpenXcom.2010.vcxproj.filters
	src/Ruleset/ArticleDefinition.cpp
	src/Ruleset/ArticleDefinition.h
	src/Ruleset/RuleTerrain.cpp
	src/Ruleset/RuleTerrain.h
	src/Ruleset/Ruleset.cpp
	src/Savegame/SavedBattleGame.cpp
	src/Savegame/SavedBattleGame.h
	src/Ufopaedia/Ufopaedia.cpp