rebase code

brining code up to date and merging with base code
link incremental configuration

for some reason it was causing a compiling error modified the link
incremental from true to false. Now compiling.
merging
Merge branch 'master' into WIP

Conflicts:
	bin/data/Language/en-US.yml
	src/Battlescape/BattlescapeGenerator.cpp
	src/Battlescape/BattlescapeGenerator.h
	src/Battlescape/ExplosionBState.cpp
	src/Battlescape/Map.cpp
	src/Battlescape/Map.h
	src/Engine/Options.cpp
	src/Menu/OptionsAdvancedState.cpp
	src/Ruleset/RuleItem.cpp
	src/Ruleset/RuleItem.h
	src/Savegame/BattleUnit.h
corrected more conflicts
Merge pull request #30 from Xracer/WIP

Rebase and proper compilation