adjust bubbles when aiming.
use different sprite sheet for underwater bullets
fix reorder, remove unused variables from Globe
Merge pull request #939 from ajschult/Globe-compile

fix reorder, remove unused variables from Globe
merge + remove Geodata.Dat ( how'd that get in there? )

Merge branch 'master' of https://github.com/SupSuper/OpenXcom into oXc_kL
Conflicts:
	src/Battlescape/Map.cpp
	src/Battlescape/Map.h
	src/Geoscape/Globe.cpp