refactoring
Merge branch 'view_distance'

Conflicts:
	src/Battlescape/TileEngine.cpp
	src/Ruleset/Ruleset.cpp
	src/Ruleset/Ruleset.h