Compiler fix
add complete TFTD USOpaedia support

wow, that's a big one.

that's what she said.
add a missing comparison
remove some meaningless includes and junk
still working out Craft range / fuel discrepancies + merge

Merge branch 'master' of https://github.com/SupSuper/OpenXcom into oXc_kL
Conflicts:
	Makefile.am
	src/Battlescape/BattlescapeGenerator.cpp
	src/CMakeLists.txt
	src/OpenXcom.2010.vcxproj
	src/Ruleset/ArticleDefinition.cpp
	src/Ruleset/ArticleDefinition.h
	src/Ruleset/Ruleset.cpp
	src/Ufopaedia/ArticleStateTFTD.cpp
	src/Ufopaedia/ArticleStateTFTD.h
	src/Ufopaedia/Ufopaedia.cpp
	src/Ufopaedia/UfopaediaSelectState.cpp
	src/Ufopaedia/UfopaediaSelectState.h
rules: for Craft fuel ( max & refuel rates )